Re: [Patch] ariadne: fix possible null dereference

On Sun, Mar 6, 2011 at 20:11, Randy Dunlap [off-list ref] wrote:

On Sun, 6 Mar 2011 02:08:32 -0500 j223yang@asset.uwaterloo.ca wrote:

quoted

Hi Randy,
I have tested my patch, and it is ok now.
Could you please try patching again? Sorry for previous trouble.
Thank you!

Acked-by: Randy Dunlap <redacted>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

quoted

------------------------------------------------------
This patch fixes bugzilla #13853:
https://bugzilla.kernel.org/show_bug.cgi?id=13853

The patch removes dereference of 'dev' after testing for NULL.

Signed-off-by: Jinqiu Yang<redacted>
---
 ariadne.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
--- a/drivers/net/ariadne.c   2011-03-04 11:16:42.332164362 -0500
+++ b/drivers/net/ariadne.c   2011-03-05 21:11:52.949164759 -0500

@@ -420,7 +420,7 @@ static inline void ariadne_reset(struct

 static irqreturn_t ariadne_interrupt(int irq, void *data)
 {
     struct net_device *dev = (struct net_device *)data;
-    volatile struct Am79C960 *lance = (struct Am79C960*)dev->base_addr;
+    volatile struct Am79C960 *lance;
     struct ariadne_private *priv;
     int csr0, boguscnt;
     int handled = 0;

@@ -430,6 +430,7 @@ static irqreturn_t ariadne_interrupt(int

      return IRQ_NONE;
     }

+    lance = (struct Am79C960 *)dev->base_addr;
     lance->RAP = CSR0;                       /* PCnet-ISA Controller Status */

     if (!(lance->RDP & INTR))                /* Check if any interrupt has been */

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds