[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200907290050.n6T0oL0o024740@mercury.physics.adelaide.edu.au>
Date: Wed, 29 Jul 2009 10:20:21 +0930 (CST)
From: Jonathan Woithe <jwoithe@...sics.adelaide.edu.au>
To: pmarques@...popie.com (Paulo Marques)
Cc: julia@...u.dk (Julia Lawall), jwoithe@...sics.adelaide.edu.au,
linux-acpi@...r.kernel.org, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: Re: [PATCH 6/12] drivers/platform/x86: Correct redundant test
Hi guys
> Julia Lawall wrote:
> > [...]
> > ---
> > drivers/platform/x86/fujitsu-laptop.c | 3 ---
> > 1 files changed, 0 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
> > index 218b9a1..5306901 100644
> > --- a/drivers/platform/x86/fujitsu-laptop.c
> > +++ b/drivers/platform/x86/fujitsu-laptop.c
> > @@ -745,9 +745,6 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type)
> >
> > fujitsu = acpi_driver_data(device);
> >
> > - if (!device || !acpi_driver_data(device))
> > - return -EINVAL;
> > -
>
> Shouldn't this still do a:
>
> if (!fujitsu)
> return -EINVAL;
>
> to avoid dereferencing a NULL pointer below?
Hmm, yes it should. Well spotted. And I'm not certain how the duplicate
test on "device" got in there in the first place. I suspect it came about
due to some structural changes made a few versions ago and I failed to
notice that the second check became redundant.
So, combining this with the above patch we should instead do
Signed-off-by: jwoithe@...sics.adelaide.edu.au <Jonathan Woithe>
--- a/drivers/platform/x86/fujitsu-laptop.c 2009-06-12 19:51:45.333234000 +0930
+++ b/drivers/platform/x86/fujitsu-laptop.c 2009-07-29 10:14:30.610249941 +0930
@@ -745,7 +745,7 @@ static int acpi_fujitsu_remove(struct ac
fujitsu = acpi_driver_data(device);
- if (!device || !acpi_driver_data(device))
+ if (!fujitsu)
return -EINVAL;
fujitsu->acpi_handle = NULL;
Regards
jonathan
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists