* [PATCH 2.6.32 1/3] net: Fix ks8851 snl NULL pointer dereference Oops
@ 2009-12-03 21:06 Ha, Tristram
2009-12-04 0:04 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ha, Tristram @ 2009-12-03 21:06 UTC (permalink / raw)
To: Ben Dooks; +Cc: netdev, linux-kernel
From: Tristram Ha <Tristram.Ha@micrel.com>
This fixes the NULL pointer dereference Oops in the ks8851 snl network driver during transmission. All socket buffers from the queue are processed inside the loop, but new workqueues have been scheduled to run.
Signed-off-by: Tristram Ha <Tristram.Ha@micrel.com>
---
diff -urpN linux-2.6.32.old/drivers/net/ks8851.c linux-2.6.32.new/drivers/net/ks8851.c
--- linux-2.6.32.old/drivers/net/ks8851.c 2009-11-03 11:37:49.000000000 -0800
+++ linux-2.6.32.new/drivers/net/ks8851.c 2009-12-02 15:31:39.000000000 -0800
@@ -1,4 +1,4 @@
-/* drivers/net/ks8651.c
+/* drivers/net/ks8851.c
*
* Copyright 2009 Simtec Electronics
* http://www.simtec.co.uk/
@@ -714,7 +714,7 @@ static void ks8851_tx_work(struct work_s
{
struct ks8851_net *ks = container_of(work, struct ks8851_net, tx_work);
struct sk_buff *txb;
- bool last = false;
+ bool last = skb_queue_empty(&ks->txq);
mutex_lock(&ks->lock);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 2.6.32 1/3] net: Fix ks8851 snl NULL pointer dereference Oops
2009-12-03 21:06 [PATCH 2.6.32 1/3] net: Fix ks8851 snl NULL pointer dereference Oops Ha, Tristram
@ 2009-12-04 0:04 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-12-04 0:04 UTC (permalink / raw)
To: Tristram.Ha; +Cc: ben, netdev, linux-kernel
From: "Ha, Tristram" <Tristram.Ha@Micrel.Com>
Date: Thu, 3 Dec 2009 13:06:42 -0800
> From: Tristram Ha <Tristram.Ha@micrel.com>
>
> This fixes the NULL pointer dereference Oops in the ks8851 snl network driver during transmission. All socket buffers from the queue are processed inside the loop, but new workqueues have been scheduled to run.
>
> Signed-off-by: Tristram Ha <Tristram.Ha@micrel.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-04 0:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-12-03 21:06 [PATCH 2.6.32 1/3] net: Fix ks8851 snl NULL pointer dereference Oops Ha, Tristram
2009-12-04 0:04 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®