lkml.org 
[lkml]   [2011]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[004/107] atm: br2684: Fix oops due to skb->dev being NULL
    2.6.32-longterm review patch.  If anyone has any objections, please let us know.

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

    From: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>

    commit fbe5e29ec1886967255e76946aaf537b8cc9b81e upstream.

    This oops have been already fixed with commit

    27141666b69f535a4d63d7bc6d9e84ee5032f82a

    atm: [br2684] Fix oops due to skb->dev being NULL

    It happens that if a packet arrives in a VC between the call to open it on
    the hardware and the call to change the backend to br2684, br2684_regvcc
    processes the packet and oopses dereferencing skb->dev because it is
    NULL before the call to br2684_push().

    but have been introduced again with commit

    b6211ae7f2e56837c6a4849316396d1535606e90

    atm: Use SKB queue and list helpers instead of doing it by-hand.

    Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/atm/br2684.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    --- a/net/atm/br2684.c
    +++ b/net/atm/br2684.c
    @@ -530,12 +530,13 @@ static int br2684_regvcc(struct atm_vcc
    spin_unlock_irqrestore(&rq->lock, flags);

    skb_queue_walk_safe(&queue, skb, tmp) {
    - struct net_device *dev = skb->dev;
    + struct net_device *dev;
    +
    + br2684_push(atmvcc, skb);
    + dev = skb->dev;

    dev->stats.rx_bytes -= skb->len;
    dev->stats.rx_packets--;
    -
    - br2684_push(atmvcc, skb);
    }
    __module_get(THIS_MODULE);
    return 0;



    \
     
     \ /
      Last update: 2011-11-03 02:39    [W:4.078 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site