From 97632199b7bed7d7313a5bff7dc0e55cd4ce6c6e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 3 Jan 2006 15:54:47 -0800 Subject: [PATCH] added series file and a 2.6.15 patch --- queue-2.6.14/series | 5 +++ ...heck-in-br_stp_recalculate_bridge_id.patch | 39 +++++++++++++++++++ queue/series | 1 + 3 files changed, 45 insertions(+) create mode 100644 queue-2.6.14/series create mode 100644 queue/bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch create mode 100644 queue/series diff --git a/queue-2.6.14/series b/queue-2.6.14/series new file mode 100644 index 00000000000..e03fc57227e --- /dev/null +++ b/queue-2.6.14/series @@ -0,0 +1,5 @@ +acpi-fix-asus_acpi-on-samsung-p30-p35.patch +drivers-net-sungem.c-gem_remove_one-mustn-t-be-__devexit.patch +ieee80211_crypt_tkip-depends-on-net_radio.patch +insanity-avoidance-in-proc.patch +sysctl-don-t-overflow-the-user-supplied-buffer-with-0.patch diff --git a/queue/bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch b/queue/bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch new file mode 100644 index 00000000000..14e10412dca --- /dev/null +++ b/queue/bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch @@ -0,0 +1,39 @@ +From stable-bounces@linux.kernel.org Tue Jan 3 15:31:50 2006 +Date: Tue, 3 Jan 2006 15:28:05 -0800 +From: Stephen Hemminger +To: stable@kernel.org +Message-ID: <20060103152805.39fda518@dxpl.pdx.osdl.net> +Cc: +Subject: BRIDGE: Fix faulty check in br_stp_recalculate_bridge_id() + +There is a regression in 2.6.15. +One of the conversions from memcmp to compare_ether_addr is incorrect. +We need to do relative comparison to determine min MAC address to +use in bridge id. This will cause the wrong bridge id to be chosen +which violates 802.1d Spanning Tree Protocol, and may create forwarding +loops. + +Signed-off-by: Stephen Hemminger + +--- linux-2.6.15.orig/net/bridge/br_stp_if.c ++++ linux-2.6.15/net/bridge/br_stp_if.c +@@ -158,7 +158,7 @@ void br_stp_recalculate_bridge_id(struct + + list_for_each_entry(p, &br->port_list, list) { + if (addr == br_mac_zero || +- compare_ether_addr(p->dev->dev_addr, addr) < 0) ++ memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0) + addr = p->dev->dev_addr; + + } +- + +-- +Stephen Hemminger +OSDL http://developer.osdl.org/~shemminger + +_______________________________________________ +stable mailing list +stable@linux.kernel.org +http://linux.kernel.org/mailman/listinfo/stable + diff --git a/queue/series b/queue/series new file mode 100644 index 00000000000..957e651946a --- /dev/null +++ b/queue/series @@ -0,0 +1 @@ +bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch -- 2.47.3