projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13601cd
)
pkt_sched: Fix missed RCU unlock in dev_queue_xmit()
author
David S. Miller
<davem@davemloft.net>
Mon, 18 Aug 2008 06:37:16 +0000
(23:37 -0700)
committer
David S. Miller
<davem@davemloft.net>
Mon, 18 Aug 2008 06:37:16 +0000
(23:37 -0700)
Noticed by Jarek Poplawski.
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c
patch
|
blob
|
history
diff --git
a/net/core/dev.c
b/net/core/dev.c
index
819f017
..
8d13380
100644
(file)
--- a/
net/core/dev.c
+++ b/
net/core/dev.c
@@
-1805,14
+1805,12
@@
gso:
spin_lock(root_lock);
if (unlikely(test_bit(__QDISC_STATE_DEACTIVATED, &q->state))) {
-
spin_unlock(root_lock
);
+
kfree_skb(skb
);
rc = NET_XMIT_DROP;
- goto out_kfree_skb;
+ } else {
+ rc = qdisc_enqueue_root(skb, q);
+ qdisc_run(q);
}
-
- rc = qdisc_enqueue_root(skb, q);
- qdisc_run(q);
-
spin_unlock(root_lock);
goto out;