lkml.org 
[lkml]   [2011]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[24/70] pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

    ------------------


    From: Ulrich Weber <uweber@astaro.com>

    [ Upstream commit ae07b0b221b6ab2edf9e3abd518aec6cd3f1ba66 ]

    otherwise we loop forever if a PPPoE socket was set
    to PPPOX_ZOMBIE state by a PADT message when the
    ethernet device is going down afterwards.

    Signed-off-by: Ulrich Weber <uweber@astaro.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/net/pppoe.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/pppoe.c
    +++ b/drivers/net/pppoe.c
    @@ -317,7 +317,7 @@ static void pppoe_flush_dev(struct net_d
    lock_sock(sk);

    if (po->pppoe_dev == dev &&
    - sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND)) {
    + sk->sk_state & (PPPOX_CONNECTED | PPPOX_BOUND | PPPOX_ZOMBIE)) {
    pppox_unbind_sock(sk);
    sk->sk_state = PPPOX_ZOMBIE;
    sk->sk_state_change(sk);



    \
     
     \ /
      Last update: 2011-04-19 22:31    [W:0.020 / U:0.988 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site