Skip to content

Commit

Permalink
bridge: fix forwarding of IPv6
Browse files Browse the repository at this point in the history
The commit 6b1e960
    bridge: Reset IPCB when entering IP stack on NF_FORWARD
broke forwarding of IPV6 packets in bridge because it would
call bp_parse_ip_options with an IPV6 packet.

Reported-by: Noah Meyerhans <noahm@debian.org>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed May 13, 2011
1 parent a10e146 commit cb68552
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/bridge/br_netfilter.c
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ 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))
if (pf == PF_INET && br_parse_ip_options(skb))
return NF_DROP;

/* The physdev module checks on this */
Expand Down

0 comments on commit cb68552

Please sign in to comment.