diff options
| author | Vlad Yasevich <vyasevic@redhat.com> | 2013-02-13 12:00:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-13 19:41:46 -0500 |
| commit | 85f46c6baef1486ce20e13dd7cdea5dd15be2a90 (patch) | |
| tree | aab52d4f01320337bfc59358d26fc856e717a8f2 /net/bridge/br_input.c | |
| parent | a37b85c9fbd1dc69fbec3985763f373203eaf9e3 (diff) | |
| download | linux-85f46c6baef1486ce20e13dd7cdea5dd15be2a90.tar.gz linux-85f46c6baef1486ce20e13dd7cdea5dd15be2a90.tar.bz2 linux-85f46c6baef1486ce20e13dd7cdea5dd15be2a90.zip | |
bridge: Verify that a vlan is allowed to egress on given port
When bridge forwards a frame, make sure that a frame is allowed
to egress on that port.
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_input.c')
| -rw-r--r-- | net/bridge/br_input.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 4ef3f6b17bd0..787d7dad6b7e 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -35,6 +35,16 @@ static int br_pass_frame_up(struct sk_buff *skb) brstats->rx_bytes += skb->len; u64_stats_update_end(&brstats->syncp); + /* Bridge is just like any other port. Make sure the + * packet is allowed except in promisc modue when someone + * may be running packet capture. + */ + if (!(brdev->flags & IFF_PROMISC) && + !br_allowed_egress(br, br_get_vlan_info(br), skb)) { + kfree_skb(skb); + return NET_RX_DROP; + } + indev = skb->dev; skb->dev = brdev; |