[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070830122258.1c606516@freepuppy.rosehill.hemminger.net>
Date: Thu, 30 Aug 2007 12:22:58 -0700
From: Stephen Hemminger <shemminger@...ux-foundation.org>
To: wang dengyi <dy_wang@...oo.com>,
"David S. Miller" <davem@...emloft.net>
Cc: bridge@...ts.linux-foundation.org, netdev@...r.kernel.org
Subject: [PATCH] bridge: packets leaking out of disabled/blocked ports
This patch fixes some packet leakage in bridge. The bridging code
was allowing forward table entries to be generated even if a device
was being blocked. The fix is to not add forwarding database entries
unless the port is active.
The bug arose as part of the conversion to processing STP frames
through normal receive path (in 2.6.17).
Signed-off-by: Stephen Hemminger <shemminger@...ux-foundation.org>
--- a/net/bridge/br_fdb.c 2007-08-30 07:49:01.000000000 -0700
+++ b/net/bridge/br_fdb.c 2007-08-30 11:40:36.000000000 -0700
@@ -384,6 +384,11 @@ void br_fdb_update(struct net_bridge *br
if (hold_time(br) == 0)
return;
+ /* ignore packets unless we are using this port */
+ if (!(source->state == BR_STATE_LEARNING ||
+ source->state == BR_STATE_FORWARDING))
+ return;
+
fdb = fdb_find(head, addr);
if (likely(fdb)) {
/* attempt to update an entry for a local interface */
--- a/net/bridge/br_input.c 2007-08-30 07:49:01.000000000 -0700
+++ b/net/bridge/br_input.c 2007-08-30 12:19:57.000000000 -0700
@@ -101,9 +101,8 @@ static int br_handle_local_finish(struct
{
struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
- if (p && p->state != BR_STATE_DISABLED)
+ if (p)
br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
-
return 0; /* process further */
}
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists