diff options
author | Daniel Schwierzeck <daniel.schwierzeck@googlemail.com> | 2011-08-19 08:04:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-20 17:13:05 -0400 |
commit | fbe5e29ec1886967255e76946aaf537b8cc9b81e (patch) | |
tree | 29256fddc5970305e8f70b1df36a208deede83dd /net/atm | |
parent | 98e77438aed3cd3343cbb86825127b1d9d2bea33 (diff) |
atm: br2684: Fix oops due to skb->dev being NULL
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>
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/br2684.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 52cfd0c3ea71..d07223c834af 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
@@ -558,12 +558,13 @@ static int br2684_regvcc(struct atm_vcc *atmvcc, void __user * arg) | |||
558 | spin_unlock_irqrestore(&rq->lock, flags); | 558 | spin_unlock_irqrestore(&rq->lock, flags); |
559 | 559 | ||
560 | skb_queue_walk_safe(&queue, skb, tmp) { | 560 | skb_queue_walk_safe(&queue, skb, tmp) { |
561 | struct net_device *dev = skb->dev; | 561 | struct net_device *dev; |
562 | |||
563 | br2684_push(atmvcc, skb); | ||
564 | dev = skb->dev; | ||
562 | 565 | ||
563 | dev->stats.rx_bytes -= skb->len; | 566 | dev->stats.rx_bytes -= skb->len; |
564 | dev->stats.rx_packets--; | 567 | dev->stats.rx_packets--; |
565 | |||
566 | br2684_push(atmvcc, skb); | ||
567 | } | 568 | } |
568 | 569 | ||
569 | /* initialize netdev carrier state */ | 570 | /* initialize netdev carrier state */ |