2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------ From: Stephen Hemminger <[email protected]> [ Upstream commit cb68552858c64db302771469b1202ea09e696329 ] The commit 6b1e960fdbd75dcd9bcc3ba5ff8898ff1ad30b6e 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 <[email protected]> Signed-off-by: Stephen Hemminger <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- net/bridge/br_netfilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c @@ -739,7 +739,7 @@ static unsigned int br_nf_forward_ip(uns 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 */ _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
