From: Julia Lawall <julia@diku.dk>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Mattia Dongili <malattia@linux.it>,
Matthew Garrett <mjg@redhat.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH 9/11] drivers/platform/x86: Eliminate a NULL pointer dereference
Date: Thu, 27 May 2010 18:25:11 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.64.1005271824510.5422@ask.diku.dk> (raw)
In-Reply-To: <201005270921.43049.dmitry.torokhov@gmail.com>
On Thu, 27 May 2010, Dmitry Torokhov wrote:
> On Thursday 27 May 2010 05:37:00 am Julia Lawall wrote:
> > From: Julia Lawall <julia@diku.dk>
> >
> > Give different error messages if device_enum is NULL or if its type field
> > has the wrong value.
> >
> > A simplified version of the semantic match that finds this problem is as
> > follows: (http://coccinelle.lip6.fr/)
> >
> > // <smpl>
> > @r exists@
> > expression E,E1;
> > identifier f;
> > statement S1,S2,S3;
> > @@
> >
> > if ((E == NULL && ...) || ...)
> > {
> > ... when != if (...) S1 else S2
> > when != E = E1
> > * E->f
> > ... when any
> > return ...;
> > }
> > else S3
> > // </smpl>
> >
> > Signed-off-by: Julia Lawall <julia@diku.dk>
> >
> > ---
> > This may be too much clutter for little benefit. Other, perhaps less
> > informative solutions are possible.
>
> Verbosity should be OK but I think that mixing pr_xxx() and naked printks
> in the same patch is not very nice.
Oops, sorry about that. I will change it.
julia
> > drivers/platform/x86/sony-laptop.c | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/platform/x86/sony-laptop.c
> > b/drivers/platform/x86/sony-laptop.c index 1387c5f..9db8d2b 100644
> > --- a/drivers/platform/x86/sony-laptop.c
> > +++ b/drivers/platform/x86/sony-laptop.c
> > @@ -1196,8 +1196,12 @@ static void sony_nc_rfkill_setup(struct acpi_device
> > *device) }
> >
> > device_enum = (union acpi_object *) buffer.pointer;
> > - if (!device_enum || device_enum->type != ACPI_TYPE_BUFFER) {
> > - printk(KERN_ERR "Invalid SN06 return object 0x%.2x\n",
> > + if (!device_enum) {
> > + pr_err("Invalid SN06 return object\n");
> > + goto out_no_enum;
> > + }
> > + if (device_enum->type != ACPI_TYPE_BUFFER) {
> > + printk(KERN_ERR "Invalid SN06 return object type 0x%.2x\n",
> > device_enum->type);
> > goto out_no_enum;
> > }
>
> Thanks.
>
> --
> Dmitry
>
next prev parent reply other threads:[~2010-05-27 16:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-27 12:37 Julia Lawall
2010-05-27 16:21 ` Dmitry Torokhov
2010-05-27 16:25 ` Julia Lawall [this message]
2010-05-27 16:32 ` Julia Lawall
2010-05-28 17:25 ` Matthew Garrett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.1005271824510.5422@ask.diku.dk \
--to=julia@diku.dk \
--cc=dmitry.torokhov@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=malattia@linux.it \
--cc=mjg@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®