From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: [Patch] ariadne: fix possible null dereference Date: Sun, 6 Mar 2011 11:11:41 -0800 Message-ID: <20110306111141.9cc51306.rdunlap@xenotime.net> References: <20110306070832.GA26188@asset.uwaterloo.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: j223yang@asset.uwaterloo.ca Return-path: In-Reply-To: <20110306070832.GA26188@asset.uwaterloo.ca> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On Sun, 6 Mar 2011 02:08:32 -0500 j223yang@asset.uwaterloo.ca 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 Thanks. > Jinqiu > ------------------------------------------------------ > 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 > --- > 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 */ --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***