From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F110EC47087 for ; Fri, 28 May 2021 07:08:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE69161184 for ; Fri, 28 May 2021 07:08:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229835AbhE1HJo (ORCPT ); Fri, 28 May 2021 03:09:44 -0400 Received: from mx2.suse.de ([195.135.220.15]:42844 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbhE1HJn (ORCPT ); Fri, 28 May 2021 03:09:43 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1622185688; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ooc335591HUSi3x/IffA4LdiHUXsY23ir/m7hXhMlm4=; b=RHZzZxsmjEqsYnviF1wOFnpfrKEh1plU479RrtMZQRK5Tyy+ZRIvSjbOrZE+JZF5v9QJPA lc4f74X1vUCYQ95BgygARAso4Qyu87siGXLUEXOwwLHDQBa6x8QI8Cori4ID8UQCRkAsyg xp1YhkMvIf09i0VfwWx3GT8AjN0QOE4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1622185688; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ooc335591HUSi3x/IffA4LdiHUXsY23ir/m7hXhMlm4=; b=hvJ6hJExJrPQsiVwePg6LXmBX05T6QvEMjBxPVfIF/WcBKDXOwcFP/AsjbkMO3+Pwykzew IP+bUcGwH4FLMIBQ== Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 67968B2E4; Fri, 28 May 2021 07:08:08 +0000 (UTC) Date: Fri, 28 May 2021 09:08:08 +0200 Message-ID: From: Takashi Iwai To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] Input: elants_i2c - Fix NULL dereference at probing In-Reply-To: References: <20210527173153.16470-1-tiwai@suse.de> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org On Thu, 27 May 2021 23:30:59 +0200, Dmitry Torokhov wrote: > > Hi Takashi, > > On Thu, May 27, 2021 at 07:31:53PM +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: > > Signed-off-by: Takashi Iwai > > --- > > 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, > > Might want to switch to probe_new() to avoid same/similar issue down > the road, either in the same patch or in a separate one. I think it's better to split. Will submit v3 with the fixes mentioned below. thanks, Takashi > > > > 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); > > I think this might need to go through an intermediate cast to shut up > compiler warnings: > > ts->chip_id = (enum elants_chip_id)(uintptr_t) > 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 }, > > As the bot mentioned this needs a cast. > > > { /* sentinel */ } > > }; > > MODULE_DEVICE_TABLE(of, elants_of_match); > > -- > > 2.26.2 > > > > Thanks. > > -- > Dmitry >