From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: Kangjie Lu <kjlu@umn.edu>,
pakki001@umn.edu, Riku Voipio <riku.voipio@iki.fi>,
Pavel Machek <pavel@ucw.cz>,
linux-leds@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] leds: fix a potential NULL pointer dereference
Date: Sun, 31 Mar 2019 11:06:05 +0200 [thread overview]
Message-ID: <CAMuHMdXELu2tcSB5C1yKUGft6sDGPAy997ApPzy17n0MssfyWA@mail.gmail.com> (raw)
In-Reply-To: <8c616b91-8f0d-f53b-af10-4d768063c5a0@gmail.com>
Hi Jacek,
On Sun, Mar 10, 2019 at 9:40 PM Jacek Anaszewski
<jacek.anaszewski@gmail.com> wrote:
> On 3/9/19 7:04 AM, Kangjie Lu wrote:
> > In case of_match_device cannot find a match, the fixes returns
> > -EINVAL to avoid NULL pointer dereference.
> >
> > Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> > ---
> > drivers/leds/leds-pca9532.c | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
> > index 7fea18b0c15d..4b0335591728 100644
> > --- a/drivers/leds/leds-pca9532.c
> > +++ b/drivers/leds/leds-pca9532.c
> > @@ -513,6 +513,7 @@ static int pca9532_probe(struct i2c_client *client,
> > const struct i2c_device_id *id)
> > {
> > int devid;
> > + const struct of_device_id *of_id;
> > struct pca9532_data *data = i2c_get_clientdata(client);
> > struct pca9532_platform_data *pca9532_pdata =
> > dev_get_platdata(&client->dev);
> > @@ -528,8 +529,11 @@ static int pca9532_probe(struct i2c_client *client,
> > dev_err(&client->dev, "no platform data\n");
> > return -EINVAL;
> > }
> > - devid = (int)(uintptr_t)of_match_device(
> > - of_pca9532_leds_match, &client->dev)->data;
> > + of_id = of_match_device(of_pca9532_leds_match,
> > + &client->dev);
> > + if (unlikely(!of_id))
Use of unlikey() is frowned upon.
Moreover, this cannot happen, as pca9532_of_populate_pdata() already
contains a similar check.
Kangjie: please stop submitting patches for missing checks, without
investigating if the failures can actually happen. Thanks!
> > + return -EINVAL;
> > + devid = (int)of_id->data;
> > } else {
> > devid = id->driver_data;
> > }
>
>
> Applied to the for-5.2 branch of linux-leds.git.
And also as a fix for v5.1...
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
next prev parent reply other threads:[~2019-03-31 9:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-09 6:04 [PATCH] leds: fix a potential NULL pointer dereference Kangjie Lu
2019-03-10 20:27 ` Jacek Anaszewski
2019-03-11 10:09 ` Enrico Weigelt, metux IT consult
2019-03-31 9:06 ` Geert Uytterhoeven [this message]
2019-03-31 10:52 ` Jacek Anaszewski
2019-03-31 11:01 ` Jacek Anaszewski
2019-04-01 7:08 ` Geert Uytterhoeven
2019-04-02 18:48 ` Jacek Anaszewski
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=CAMuHMdXELu2tcSB5C1yKUGft6sDGPAy997ApPzy17n0MssfyWA@mail.gmail.com \
--to=geert@linux-m68k.org \
--cc=jacek.anaszewski@gmail.com \
--cc=kjlu@umn.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pakki001@umn.edu \
--cc=pavel@ucw.cz \
--cc=riku.voipio@iki.fi \
/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;
as well as URLs for NNTP newsgroup(s).