From: Takashi Iwai <tiwai@suse.de>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] Input: elants_i2c - Fix NULL dereference at probing
Date: Thu, 27 May 2021 22:31:56 +0200 [thread overview]
Message-ID: <s5hbl8v6hqb.wl-tiwai@suse.de> (raw)
In-Reply-To: <20210527173153.16470-1-tiwai@suse.de>
On Thu, 27 May 2021 19:31:53 +0200,
Takashi Iwai wrote:
>
> The recent change in elants_i2c driver to support more chips
> introduced a regression leading to Oops at probing. The driver reads
> id->driver_data, but the id may be NULL depending on the device type
> the driver gets bound.
>
> Replace the driver data extraction with the device_get_match_data()
> helper, and define the driver data in OF table, too.
>
> Fixes: 9517b95bdc46 ("Input: elants_i2c - add support for eKTF3624")
> BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1186454
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
It seems that the cast is missing in elants_of_match[] data.
I'll post a v3 patch with the correction. Let me know if that's the
only needed fix.
thanks,
Takashi
> ---
> v1->v2: Use device_get_match_data()
>
> drivers/input/touchscreen/elants_i2c.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
> index 17540bdb1eaf..29b5bb03cff9 100644
> --- a/drivers/input/touchscreen/elants_i2c.c
> +++ b/drivers/input/touchscreen/elants_i2c.c
> @@ -1396,7 +1396,7 @@ static int elants_i2c_probe(struct i2c_client *client,
> init_completion(&ts->cmd_done);
>
> ts->client = client;
> - ts->chip_id = (enum elants_chip_id)id->driver_data;
> + ts->chip_id = (enum elants_chip_id)device_get_match_data(&client->dev);
> i2c_set_clientdata(client, ts);
>
> ts->vcc33 = devm_regulator_get(&client->dev, "vcc33");
> @@ -1636,8 +1636,8 @@ MODULE_DEVICE_TABLE(acpi, elants_acpi_id);
>
> #ifdef CONFIG_OF
> static const struct of_device_id elants_of_match[] = {
> - { .compatible = "elan,ekth3500" },
> - { .compatible = "elan,ektf3624" },
> + { .compatible = "elan,ekth3500", .data = EKTH3500 },
> + { .compatible = "elan,ektf3624", .data = EKTF3624 },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, elants_of_match);
> --
> 2.26.2
>
next prev parent reply other threads:[~2021-05-27 20:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 17:31 [PATCH v2] Input: elants_i2c - Fix NULL dereference at probing Takashi Iwai
2021-05-27 18:59 ` kernel test robot
2021-05-27 19:17 ` kernel test robot
2021-05-27 19:19 ` kernel test robot
2021-05-27 19:31 ` kernel test robot
2021-05-27 20:31 ` Takashi Iwai [this message]
2021-05-27 21:30 ` Dmitry Torokhov
2021-05-28 7:08 ` Takashi Iwai
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=s5hbl8v6hqb.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@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;
as well as URLs for NNTP newsgroup(s).