lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 162/230] Input: st-keyscan - fix potential zalloc NULL dereference
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 2439d37e1bf8a34d437573c086572abe0f3f1b15 ]

    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 <dan.carpenter@oracle.com>
    Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 de7be4f03d91..ebf9f643d910 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.19.1


    \
     
     \ /
      Last update: 2019-03-22 14:09    [W:4.336 / U:0.656 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site