bridge: fix netfilter/NF_BR_LOCAL_OUT for own, locally generated queries
Subsystems (3)
PATCH 1/1 bridge: fix netfilter/NF_BR_LOCAL_OUT for own, locally generated queries
Ebtables on the OUTPUT chain (NF_BR_LOCAL_OUT) would not work as expected for both locally generated IGMP and MLD queries. The IP header specific filter options are off by 14 Bytes for netfilter (actual output on interfaces is fine).
NF_HOOK() expects the skb->data to point to the IP header, not the ethernet one (while dev_queue_xmit() does not). Luckily there is an br_dev_queue_push_xmit() helper function already - let's just use that.
Introduced by eb1d16414339a6e113d89e2cca2556005d7ce919 ("bridge: Add core IGMP snooping support")
Ebtables example:
$ ebtables -I OUTPUT -p IPv6 -o eth1 --logical-out br0 \ --log --log-level 6 --log-ip6 --log-prefix="~EBT: " -j DROP
before (broken):
~EBT: IN= OUT=eth1 MAC source = 02:04:64:a4:39:c2 \ MAC dest = 33:33:00:00:00:01 proto = 0x86dd IPv6 \ SRC=64a4:39c2:86dd:6000:0000:0020:0001:fe80 IPv6 \ DST=0000:0000:0000:0004:64ff:fea4:39c2:ff02, \ IPv6 priority=0x3, Next Header=2
after (working):
~EBT: IN= OUT=eth1 MAC source = 02:04:64:a4:39:c2 \ MAC dest = 33:33:00:00:00:01 proto = 0x86dd IPv6 \ SRC=fe80:0000:0000:0000:0004:64ff:fea4:39c2 IPv6 \ DST=ff02:0000:0000:0000:0000:0000:0000:0001, \ IPv6 priority=0x0, Next Header=0
--- net/bridge/br_multicast.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
net/bridge/br_multicast.c +1 -2
@@ -813,10 +813,9 @@ static void __br_multicast_send_query(struct net_bridge *br,return ;if (port) { -__skb_push (skb,sizeof (struct ethhdr )); skb->dev = port->dev;NF_HOOK (NFPROTO_BRIDGE ,NF_BR_LOCAL_OUT , skb,NULL , skb->dev, - dev_queue_xmit); + br_dev_queue_push_xmit); }else {br_multicast_select_own_querier (br, ip, skb);netif_rx (skb);
Signature · 1 line
1.7.10.4
Quoted 8 lines · Linus Lüssing
Ebtables on the OUTPUT chain (
NF_BR_LOCAL_OUT) would not work as expected for both locally generated IGMP and MLD queries. The IP header specific filter options are off by 14 Bytes for netfilter (actual output on interfaces is fine).NF_HOOK() expects the
skb->datato point to the IP header, not the ethernet one (while dev_queue_xmit() does not). Luckily there is anbr_dev_queue_push_xmit()helper function already - let's just use that.
bump
Quoted 27 lines · Linus Lüssing
Ebtables on the OUTPUT chain (
NF_BR_LOCAL_OUT) would not work as expected for both locally generated IGMP and MLD queries. The IP header specific filter options are off by 14 Bytes for netfilter (actual output on interfaces is fine).NF_HOOK() expects the
skb->datato point to the IP header, not the ethernet one (while dev_queue_xmit() does not). Luckily there is anbr_dev_queue_push_xmit()helper function already - let's just use that.Introduced by
eb1d16414339a6e113d89e2cca2556005d7ce919("bridge: Add core IGMP snooping support")Ebtables example:
$ ebtables -I OUTPUT -p IPv6 -o eth1 --logical-out br0 \ --log --log-level 6 --log-ip6 --log-prefix="~EBT: " -j DROPbefore (broken):
~EBT: IN= OUT=eth1 MAC source = 02:04:64:a4:39:c2 \ MAC dest = 33:33:00:00:00:01 proto = 0x86dd IPv6 \ SRC=64a4:39c2:86dd:6000:0000:0020:0001:fe80 IPv6 \ DST=0000:0000:0000:0004:64ff:fea4:39c2:ff02, \ IPv6 priority=0x3, Next Header=2after (working):
Quoted 7 lines
~EBT: IN= OUT=eth1 MAC source = 02:04:64:a4:39:c2 \ MAC dest = 33:33:00:00:00:01 proto = 0x86dd IPv6 \ SRC=fe80:0000:0000:0000:0004:64ff:fea4:39c2 IPv6 \ DST=ff02:0000:0000:0000:0000:0000:0000:0001, \ IPv6 priority=0x0, Next Header=0Signed-off-by Linus Lüssing <[email protected]>
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Quoted 4 lines · Herbert Xu
Quoted 1 line · Linus Lüssing
Signed-off-by Linus Lüssing <[email protected]>Acked-by Herbert Xu <[email protected]>
Hi David,
are there any unanswered questions left?
Cheers, Linus
Quoted 9 lines · Linus Lüssing
Quoted 4 lines · Herbert Xu
Quoted 1 line · Linus Lüssing
Signed-off-by Linus Lüssing <[email protected]>Acked-by Herbert Xu <[email protected]>Hi David,
are there any unanswered questions left?
Please resubmit your patch as it's no longer in David's queue.
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
David Miller
maintainerFrom: Linus Lüssing <[email protected]>
Date: Mon, 17 Nov 2014 03:08:16 +0100
Quoted 9 lines · Herbert Xu
Quoted 4 lines · Linus Lüssing
Quoted 1 line
Signed-off-by Linus Lüssing <[email protected]>Acked-by Herbert Xu <[email protected]>Hi David,
are there any unanswered questions left?
I expect to get this from the netfilter folks, since it is a netfilter change. So you should submit it to the netfilter maintainers.