All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@osdl.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, bridge@osdl.org
Subject: [Bridge] [PATCH 3/5] bridge: filter packets in learning state
Date: Tue, 20 Dec 2005 15:19:52 -0800	[thread overview]
Message-ID: <20051220232154.858392000@localhost.localdomain> (raw)
In-Reply-To: 20051220231949.772360000@localhost.localdomain

[-- Attachment #1: br-learn-fdb.patch --]
[-- Type: text/plain, Size: 1321 bytes --]

While in the learning state, run filters but drop the result.
This prevents us from acquiring bad fdb entries in learning state.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

--- br-2.6.orig/net/bridge/br_input.c
+++ br-2.6/net/bridge/br_input.c
@@ -53,6 +53,11 @@ int br_handle_frame_finish(struct sk_buf
 	/* insert into forwarding database after filtering to avoid spoofing */
 	br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
 
+	if (p->state == BR_STATE_LEARNING) {
+		kfree_skb(skb);
+		goto out;
+	}
+
 	if (br->dev->flags & IFF_PROMISC) {
 		struct sk_buff *skb2;
 
@@ -107,9 +112,6 @@ int br_handle_frame(struct net_bridge_po
 	if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
 		goto err;
 
-	if (p->state == BR_STATE_LEARNING)
-		br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
-
 	if (p->br->stp_enabled &&
 	    !memcmp(dest, bridge_ula, 5) &&
 	    !(dest[5] & 0xF0)) {
@@ -118,9 +120,10 @@ int br_handle_frame(struct net_bridge_po
 				NULL, br_stp_handle_bpdu);
 			return 1;
 		}
+		goto err;
 	}
 
-	else if (p->state == BR_STATE_FORWARDING) {
+	if (p->state == BR_STATE_FORWARDING || p->state == BR_STATE_LEARNING) {
 		if (br_should_route_hook) {
 			if (br_should_route_hook(pskb)) 
 				return 0;

--
Stephen Hemminger <shemminger@osdl.org>
OSDL http://developer.osdl.org/~shemminger


WARNING: multiple messages have this Message-ID (diff)
From: Stephen Hemminger <shemminger@osdl.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, bridge@osdl.org
Subject: [PATCH 3/5] bridge: filter packets in learning state
Date: Tue, 20 Dec 2005 15:19:52 -0800	[thread overview]
Message-ID: <20051220232154.858392000@localhost.localdomain> (raw)
In-Reply-To: 20051220231949.772360000@localhost.localdomain

[-- Attachment #1: br-learn-fdb.patch --]
[-- Type: text/plain, Size: 1321 bytes --]

While in the learning state, run filters but drop the result.
This prevents us from acquiring bad fdb entries in learning state.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

--- br-2.6.orig/net/bridge/br_input.c
+++ br-2.6/net/bridge/br_input.c
@@ -53,6 +53,11 @@ int br_handle_frame_finish(struct sk_buf
 	/* insert into forwarding database after filtering to avoid spoofing */
 	br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
 
+	if (p->state == BR_STATE_LEARNING) {
+		kfree_skb(skb);
+		goto out;
+	}
+
 	if (br->dev->flags & IFF_PROMISC) {
 		struct sk_buff *skb2;
 
@@ -107,9 +112,6 @@ int br_handle_frame(struct net_bridge_po
 	if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
 		goto err;
 
-	if (p->state == BR_STATE_LEARNING)
-		br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
-
 	if (p->br->stp_enabled &&
 	    !memcmp(dest, bridge_ula, 5) &&
 	    !(dest[5] & 0xF0)) {
@@ -118,9 +120,10 @@ int br_handle_frame(struct net_bridge_po
 				NULL, br_stp_handle_bpdu);
 			return 1;
 		}
+		goto err;
 	}
 
-	else if (p->state == BR_STATE_FORWARDING) {
+	if (p->state == BR_STATE_FORWARDING || p->state == BR_STATE_LEARNING) {
 		if (br_should_route_hook) {
 			if (br_should_route_hook(pskb)) 
 				return 0;

--
Stephen Hemminger <shemminger@osdl.org>
OSDL http://developer.osdl.org/~shemminger


[-- Attachment #2: Type: text/plain, Size: 141 bytes --]

_______________________________________________
Bridge mailing list
Bridge@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/bridge

  parent reply	other threads:[~2005-12-20 23:19 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-12-20 23:19 [Bridge] [PATCH 0/5] bridge update for 2.6.16 Stephen Hemminger
2005-12-20 23:19 ` Stephen Hemminger
2005-12-20 23:19 ` [Bridge] [PATCH 1/5] bridge: allow setting hardware address of bridge pseudo-dev Stephen Hemminger
2005-12-20 23:19   ` Stephen Hemminger
2005-12-20 23:19 ` [Bridge] [PATCH 2/5] bridge: handle speed detection after carrier changes Stephen Hemminger
2005-12-20 23:19   ` Stephen Hemminger
2005-12-20 23:19 ` Stephen Hemminger [this message]
2005-12-20 23:19   ` [PATCH 3/5] bridge: filter packets in learning state Stephen Hemminger
2005-12-20 23:19 ` [Bridge] [PATCH 4/5] bridge: limited ethtool support Stephen Hemminger
2005-12-20 23:19   ` Stephen Hemminger
2005-12-20 23:19 ` [Bridge] [PATCH 5/5] bridge: add version number Stephen Hemminger
2005-12-20 23:19   ` Stephen Hemminger
2005-12-22  3:01 ` [Bridge] Re: [PATCH 0/5] bridge update for 2.6.16 David S. Miller
2005-12-22  3:01   ` David S. Miller

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=20051220232154.858392000@localhost.localdomain \
    --to=shemminger@osdl.org \
    --cc=bridge@osdl.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.