Add fix for timer issue in bridge code (rhbz 980254)

This commit is contained in:
Josh Boyer 2013-07-05 08:57:12 -04:00
parent 6234ebaedf
commit a993279a9b
2 changed files with 18 additions and 1 deletions

13
bridge-timer-fix.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index d6448e3..aadb596 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -269,7 +269,7 @@ static void br_multicast_del_pg(struct net_bridge *br,
del_timer(&p->timer);
call_rcu_bh(&p->rcu, br_multicast_free_pg);
- if (!mp->ports && !mp->mglist &&
+ if (!mp->ports && !mp->mglist && mp->timer_armed &&
netif_running(br->dev))
mod_timer(&mp->timer, jiffies);

View File

@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
%global baserelease 301
%global baserelease 302
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -797,6 +797,8 @@ Patch25052: HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
#rhbz 880035
Patch25053: bridge-only-expire-the-mdb-entry-when-query-is-received.patch
Patch25054: bridge-send-query-as-soon-as-leave-is-received.patch
#rhbz 980254
Patch25061: bridge-timer-fix.patch
#rhbz 977558
Patch25055: ath3k-dont-use-stack-memory-for-DMA.patch
@ -1560,6 +1562,7 @@ ApplyPatch HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
#rhbz 880035
ApplyPatch bridge-only-expire-the-mdb-entry-when-query-is-received.patch
ApplyPatch bridge-send-query-as-soon-as-leave-is-received.patch
ApplyPatch bridge-timer-fix.patch
#rhbz 977558
ApplyPatch ath3k-dont-use-stack-memory-for-DMA.patch
@ -2394,6 +2397,7 @@ fi
%changelog
* Fri Jul 05 2013 Josh Boyer <jwboyer@redhat.com>
- Add fix for timer issue in bridge code (rhbz 980254)
- CVE-2013-2232 ipv6: using ipv4 vs ipv6 structure during routing lookup in sendmsg (rhbz 981552 981564)
* Thu Jul 04 2013 Dave Airlie <airlied@redhat.com>