[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20190419073923.6ojzx4ic5ylq3n3m@penguin>
Date: Fri, 19 Apr 2019 07:39:23 +0000
From: Dmitry Torokhov <dmitry.torokhov@...il.com>
To: Pan Bian <bianpan2016@....com>
Cc: Wei Yongjun <weiyongjun1@...wei.com>,
Nick Dyer <nick@...anahar.org>,
Nick Desaulniers <ndesaulniers@...gle.com>,
Kees Cook <keescook@...omium.org>, linux-input@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: Input: synaptics-rmi4: fix possible double free
On Thu, Apr 18, 2019 at 09:58:35AM +0800, Pan Bian wrote:
> The RMI4 function structure has been released in rmi_register_function
> if error occurs. However, it will be released again in the function
> rmi_create_function, which may result in a double-free bug.
>
> Signed-off-by: Pan Bian <bianpan2016@....com>
Applied, thank you.
> ---
> drivers/input/rmi4/rmi_driver.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
> index fc3ab93..7fb358f 100644
> --- a/drivers/input/rmi4/rmi_driver.c
> +++ b/drivers/input/rmi4/rmi_driver.c
> @@ -860,7 +860,7 @@ static int rmi_create_function(struct rmi_device *rmi_dev,
>
> error = rmi_register_function(fn);
> if (error)
> - goto err_put_fn;
> + return error;
>
> if (pdt->function_number == 0x01)
> data->f01_container = fn;
> @@ -870,10 +870,6 @@ static int rmi_create_function(struct rmi_device *rmi_dev,
> list_add_tail(&fn->node, &data->function_list);
>
> return RMI_SCAN_CONTINUE;
> -
> -err_put_fn:
> - put_device(&fn->dev);
> - return error;
> }
>
> void rmi_enable_irq(struct rmi_device *rmi_dev, bool clear_wake)
> --
> 2.7.4
>
>
--
Dmitry
Powered by blists - more mailing lists