[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20080802.122251.94384264.davem@davemloft.net>
Date: Sat, 02 Aug 2008 12:22:51 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: jarkao2@...il.com
Cc: emil.s.tantilov@...el.com, jeffrey.t.kirsher@...el.com,
netdev@...r.kernel.org
Subject: Re: [BUG] NULL pointer dereference in skb_dequeue
From: David Miller <davem@...emloft.net>
Date: Sat, 02 Aug 2008 12:18:15 -0700 (PDT)
> See my other emails, it isn't even necessary anyways.
Sorry, because some idiot took part of the conversation private
my follow-on fixup patch didn't make it to the list, here it is.
It goes on top of the original patch I sent out:
diff --git a/net/core/dev.c b/net/core/dev.c
index 69320a5..da7acac 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1796,7 +1796,7 @@ gso:
skb->tc_verd = SET_TC_AT(skb->tc_verd,AT_EGRESS);
#endif
if (q->enqueue) {
- spinlock_t *root_lock = qdisc_root_lock(q);
+ spinlock_t *root_lock = qdisc_lock(q);
spin_lock(root_lock);
@@ -1995,7 +1995,7 @@ static void net_tx_action(struct softirq_action *h)
smp_mb__before_clear_bit();
clear_bit(__QDISC_STATE_SCHED, &q->state);
- root_lock = qdisc_root_lock(q);
+ root_lock = qdisc_lock(q);
if (spin_trylock(root_lock)) {
qdisc_run(q);
spin_unlock(root_lock);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists