2019-02-12 15:32:46

by Gabriel FERNANDEZ

Subject: [PATCH v1] Input: st-keyscan - fix potential zalloc NULL dereference

From: Gabriel Fernandez <[email protected]>

This patch fixes the following static checker warning:

drivers/input/keyboard/st-keyscan.c:156 keyscan_probe()
error: potential zalloc NULL dereference: 'keypad_data->input_dev'

Reported-by: Dan Carpenter <[email protected]>
Signed-off-by: Gabriel Fernandez <[email protected]>
---
drivers/input/keyboard/st-keyscan.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/keyboard/st-keyscan.c b/drivers/input/keyboard/st-keyscan.c
index babcfb165e4f..3b85631fde91 100644
--- a/drivers/input/keyboard/st-keyscan.c
+++ b/drivers/input/keyboard/st-keyscan.c
@@ -153,6 +153,8 @@ static int keyscan_probe(struct platform_device *pdev)

input_dev->id.bustype = BUS_HOST;

+ keypad_data->input_dev = input_dev;
+
error = keypad_matrix_key_parse_dt(keypad_data);
if (error)
return error;
@@ -168,8 +170,6 @@ static int keyscan_probe(struct platform_device *pdev)

input_set_drvdata(input_dev, keypad_data);

- keypad_data->input_dev = input_dev;
-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
keypad_data->base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(keypad_data->base))
--
2.17.0

2019-02-17 08:30:24

by Dmitry Torokhov

Subject: Re: [PATCH v1] Input: st-keyscan - fix potential zalloc NULL dereference

On Tue, Feb 12, 2019 at 04:30:55PM +0100, [email protected] wrote:
> From: Gabriel Fernandez <[email protected]>
>
> This patch fixes the following static checker warning:
>
> drivers/input/keyboard/st-keyscan.c:156 keyscan_probe()
> error: potential zalloc NULL dereference: 'keypad_data->input_dev'
>
> Reported-by: Dan Carpenter <[email protected]>
> Signed-off-by: Gabriel Fernandez <[email protected]>

Applied, thank you.

> ---
> drivers/input/keyboard/st-keyscan.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/keyboard/st-keyscan.c b/drivers/input/keyboard/st-keyscan.c
> index babcfb165e4f..3b85631fde91 100644
> --- a/drivers/input/keyboard/st-keyscan.c
> +++ b/drivers/input/keyboard/st-keyscan.c
> @@ -153,6 +153,8 @@ static int keyscan_probe(struct platform_device *pdev)
>
> input_dev->id.bustype = BUS_HOST;
>
> + keypad_data->input_dev = input_dev;
> +
> error = keypad_matrix_key_parse_dt(keypad_data);
> if (error)
> return error;
> @@ -168,8 +170,6 @@ static int keyscan_probe(struct platform_device *pdev)
>
> input_set_drvdata(input_dev, keypad_data);
>
> - keypad_data->input_dev = input_dev;
> -
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> keypad_data->base = devm_ioremap_resource(&pdev->dev, res);
> if (IS_ERR(keypad_data->base))
> --
> 2.17.0
>

--
Dmitry