netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@vyatta.com>
To: Noah Meyerhans <noahm@debian.org>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	David Miller <davem@davemloft.net>
Cc: Ben Hutchings <ben@decadent.org.uk>,
	bridge@lists.linux-foundation.org,
	netdev <netdev@vger.kernel.org>
Subject: [PATCH] bridge: fix forwarding of IPv6
Date: Fri, 13 May 2011 12:53:14 -0700	[thread overview]
Message-ID: <20110513125314.66861b31@nehalam> (raw)
In-Reply-To: <20110510233540.GJ6397@morgul.net>

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 <noahm@debian.org>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

---
Patch against net-next-2.6 but must be applied to net-2.6
and stable as well

--- a/net/bridge/br_netfilter.c	2011-05-13 12:37:30.289646958 -0700
+++ b/net/bridge/br_netfilter.c	2011-05-13 12:38:07.820333938 -0700
@@ -737,7 +737,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 */


-- 

  parent reply	other threads:[~2011-05-13 19:53 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20110506201234.6297.70279.reportbug@ip6-localhost>
2011-05-10  2:38 ` Bug#625914: linux-image-2.6.38-2-amd64: bridging is not interacting well with multicast in 2.6.38-4 Ben Hutchings
2011-05-10  3:15   ` Stephen Hemminger
2011-05-10  4:38   ` Noah Meyerhans
2011-05-10 12:42     ` Ben Hutchings
2011-05-10 12:55       ` Yann Dupont
2011-05-10 18:05       ` Noah Meyerhans
2011-05-10 22:11         ` [Bridge] " Stephen Hemminger
2011-05-10 23:35           ` Noah Meyerhans
2011-05-12 22:59             ` David Miller
2011-05-12 23:28               ` Stephen Hemminger
2011-05-12 23:43             ` Stephen Hemminger
2011-05-13  5:03               ` Noah Meyerhans
2011-05-13 18:03             ` Stephen Hemminger
2011-05-13 19:53             ` Stephen Hemminger [this message]
2011-05-13 20:00               ` [PATCH] bridge: fix forwarding of IPv6 Eric Dumazet
2011-05-13 20:02                 ` David Miller
2011-05-13 20:05                   ` Eric Dumazet
2011-05-13 20:24                   ` [Bridge] " Stephen Hemminger
2011-05-13 20:03               ` David Miller
2011-05-13 21:00               ` Noah Meyerhans

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110513125314.66861b31@nehalam \
    --to=shemminger@vyatta.com \
    --cc=ben@decadent.org.uk \
    --cc=bridge@lists.linux-foundation.org \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=netdev@vger.kernel.org \
    --cc=noahm@debian.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).