Re: [Patch] ariadne: fix possible null dereference

[Geert Uytterhoeven]

On Sun, Mar 6, 2011 at 20:11, Randy Dunlap <rdunlap@xxxxxxxxxxxx> wrote:
> On Sun, 6 Mar 2011 02:08:32 -0500 j223yang@xxxxxxxxxxxxxxxxxx wrote:
>
>> 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 <rdunlap@xxxxxxxxxxxx>

Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

>> ------------------------------------------------------
>> 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<crindy646@xxxxxxxxx>
>> ---
>> Â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@xxxxxxxxxxxxxx

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/