hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: adp5589-keys - fix NULL pointer dereference

Browse Source 
commit fb5cc65f973661241e4a2b7390b429aa7b330c69 upstream.

We register a devm action to call adp5589_clear_config() and then pass
the i2c client as argument so that we can call i2c_get_clientdata() in
order to get our device object. However, i2c_set_clientdata() is only
being set at the end of the probe function which means that we'll get a
NULL pointer dereference in case the probe function fails early.

Fixes: 30df385e35 ("Input: adp5589-keys - use devm_add_action_or_reset() for register clear")
Signed-off-by: Nuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20241001-b4-dev-adp5589-fw-conversion-v1-1-fca0149dfc47@analog.com
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Nuno Sa 2024-10-01 07:46:44 -07:00 committed by Greg Kroah-Hartman
parent 3257b50bb0
commit 34e304cc53
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/input/keyboard/adp5589-keys.c
View File

@ -936,10 +936,9 @@ static int adp5589_keypad_add(struct adp5589_kpad *kpad, unsigned int revid)
static void adp5589_clear_config(void *data)
{
struct i2c_client *client = data;
struct adp5589_kpad *kpad = i2c_get_clientdata(client);
struct adp5589_kpad *kpad = data;
adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
adp5589_write(kpad->client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
}
static int adp5589_probe(struct i2c_client *client,
@ -983,7 +982,7 @@ static int adp5589_probe(struct i2c_client *client,
}
error = devm_add_action_or_reset(&client->dev, adp5589_clear_config,
client);
kpad);
if (error)
return error;
@ -1010,8 +1009,6 @@ static int adp5589_probe(struct i2c_client *client,
if (error)
return error;
i2c_set_clientdata(client, kpad);
dev_info(&client->dev, "Rev.%d keypad, irq %d\n", revid, client->irq);
return 0;
}