diff options
author | Florian Westphal <fw@strlen.de> | 2015-06-05 13:27:13 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-06-12 14:16:55 +0200 |
commit | d7b597421519d6f680eb8e152a0d8447466ee2d6 (patch) | |
tree | 552f6c80a7f142bc38d645a9e2874ebce433ccd8 /net/netfilter | |
parent | 33b1f31392861947fa2a2a57c3a39ab63b8c9f9d (diff) | |
download | linux-stable-d7b597421519d6f680eb8e152a0d8447466ee2d6.tar.gz linux-stable-d7b597421519d6f680eb8e152a0d8447466ee2d6.tar.bz2 linux-stable-d7b597421519d6f680eb8e152a0d8447466ee2d6.zip |
netfilter: bridge: restore vlan tag when refragmenting
If bridge netfilter is used with both
bridge-nf-call-iptables and bridge-nf-filter-vlan-tagged enabled
then ip fragments in VLAN frames are sent without the vlan header.
This has never worked reliably. Turns out this relied on pre-3.5
behaviour where skb frag_list was used to store ip fragments;
ip_fragment() then re-used these skbs.
But since commit 3cc4949269e01f39443d0fcfffb5bc6b47878d45
("ipv4: use skb coalescing in defragmentation") this is no longer
the case. ip_do_fragment now needs to allocate new skbs, but these
don't contain the vlan tag information anymore.
Fix it by storing vlan information of the ressembled skb in the
br netfilter percpu frag area, and restore them for each of the
fragments.
Fixes: 3cc4949269e01f3 ("ipv4: use skb coalescing in defragmentation")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
0 files changed, 0 insertions, 0 deletions