diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2011-03-18 06:27:28 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-18 23:13:12 +0100 |
| commit | 6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e (patch) | |
| tree | 71834e9ccd22d9e7aed7272e805a514664cf8b25 /net/bridge | |
| parent | vlan: should take into account needed_headroom (diff) | |
| download | linux-6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e.tar.xz linux-6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e.zip | |
bridge: Reset IPCB when entering IP stack on NF_FORWARD
Whenever we enter the IP stack proper from bridge netfilter we
need to ensure that the skb is in a form the IP stack expects
it to be in.
The entry point on NF_FORWARD did not meet the requirements of
the IP stack, therefore leading to potential crashes/panics.
This patch fixes the problem.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netfilter.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index f97af5590ba1..008ff6c4eecf 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -739,6 +739,9 @@ static unsigned int br_nf_forward_ip(unsigned int hook, struct sk_buff *skb, nf_bridge->mask |= BRNF_PKT_TYPE; } + if (br_parse_ip_options(skb)) + return NF_DROP; + /* The physdev module checks on this */ nf_bridge->mask |= BRNF_BRIDGED; nf_bridge->physoutdev = skb->dev; |