]>
Commit | Line | Data |
---|---|---|
d6083431 SL |
1 | From 06a893586c3742dd70ad259c994ecab8969d39e5 Mon Sep 17 00:00:00 2001 |
2 | From: Gabriel Fernandez <gabriel.fernandez@st.com> | |
3 | Date: Sat, 16 Feb 2019 21:10:16 -0800 | |
4 | Subject: Input: st-keyscan - fix potential zalloc NULL dereference | |
5 | ||
6 | [ Upstream commit 2439d37e1bf8a34d437573c086572abe0f3f1b15 ] | |
7 | ||
8 | This patch fixes the following static checker warning: | |
9 | ||
10 | drivers/input/keyboard/st-keyscan.c:156 keyscan_probe() | |
11 | error: potential zalloc NULL dereference: 'keypad_data->input_dev' | |
12 | ||
13 | Reported-by: Dan Carpenter <dan.carpenter@oracle.com> | |
14 | Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com> | |
15 | Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> | |
16 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
17 | --- | |
18 | drivers/input/keyboard/st-keyscan.c | 4 ++-- | |
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
20 | ||
21 | diff --git a/drivers/input/keyboard/st-keyscan.c b/drivers/input/keyboard/st-keyscan.c | |
22 | index de7be4f03d91..ebf9f643d910 100644 | |
23 | --- a/drivers/input/keyboard/st-keyscan.c | |
24 | +++ b/drivers/input/keyboard/st-keyscan.c | |
25 | @@ -153,6 +153,8 @@ static int keyscan_probe(struct platform_device *pdev) | |
26 | ||
27 | input_dev->id.bustype = BUS_HOST; | |
28 | ||
29 | + keypad_data->input_dev = input_dev; | |
30 | + | |
31 | error = keypad_matrix_key_parse_dt(keypad_data); | |
32 | if (error) | |
33 | return error; | |
34 | @@ -168,8 +170,6 @@ static int keyscan_probe(struct platform_device *pdev) | |
35 | ||
36 | input_set_drvdata(input_dev, keypad_data); | |
37 | ||
38 | - keypad_data->input_dev = input_dev; | |
39 | - | |
40 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | |
41 | keypad_data->base = devm_ioremap_resource(&pdev->dev, res); | |
42 | if (IS_ERR(keypad_data->base)) | |
43 | -- | |
44 | 2.19.1 | |
45 |