lkml.org 
[lkml]   [2006]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 15/39] [PATCH] [BRIDGE]: Fix deadlock in br_stp_disable_bridge
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    Looks like somebody forgot to use the _bh spin_lock variant. We ran into a
    deadlock where br->hello_timer expired while br_stp_disable_br() walked
    br->port_list.

    Signed-off-by: Adrian Drzewiecki <z@drze.net>
    Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
    Signed-off-by: "David S. Miller" <davem@davemloft.net>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---

    net/bridge/br_stp_if.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    --- linux-2.6.15.4.orig/net/bridge/br_stp_if.c
    +++ linux-2.6.15.4/net/bridge/br_stp_if.c
    @@ -67,7 +67,7 @@ void br_stp_disable_bridge(struct net_br
    {
    struct net_bridge_port *p;

    - spin_lock(&br->lock);
    + spin_lock_bh(&br->lock);
    list_for_each_entry(p, &br->port_list, list) {
    if (p->state != BR_STATE_DISABLED)
    br_stp_disable_port(p);
    @@ -76,7 +76,7 @@ void br_stp_disable_bridge(struct net_br

    br->topology_change = 0;
    br->topology_change_detected = 0;
    - spin_unlock(&br->lock);
    + spin_unlock_bh(&br->lock);

    del_timer_sync(&br->hello_timer);
    del_timer_sync(&br->topology_change_timer);
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-02-27 23:38    [W:0.019 / U:30.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site