lkml.org 
[lkml]   [2020]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Input: synaptics-rmi4 - Really fix attn_data use-after-free
On Mon, Apr 27, 2020 at 02:55:48PM -0700, Evan Green wrote:
> Fix a use-after-free noticed by running with KASAN enabled. If
> rmi_irq_fn() is run twice in a row, then rmi_f11_attention() (among
> others) will end up reading from drvdata->attn_data.data, which was
> freed and left dangling in rmi_irq_fn().
>
> Commit 55edde9fff1a ("Input: synaptics-rmi4 - prevent UAF reported by
> KASAN") correctly identified and analyzed this bug. However the attempted
> fix only NULLed out a local variable, missing the fact that
> drvdata->attn_data is a struct, not a pointer.
>
> NULL out the correct pointer in the driver data to prevent the attention
> functions from copying from it.
>
> Fixes: 55edde9fff1a ("Input: synaptics-rmi4 - prevent UAF reported by KASAN")
> Fixes: b908d3cd812a ("Input: synaptics-rmi4 - allow to add attention data")
>
> Signed-off-by: Evan Green <evgreen@chromium.org>
>
> Cc: stable@vger.kernel.org
> Cc: Nick Desaulniers <nick.desaulniers@gmail.com>

Ugh, this is all kind of ugly, but I guess that's what we have now.
Applied, thank you.

> ---
>
> drivers/input/rmi4/rmi_driver.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
> index 190b9974526bb..c18e1a25bca6e 100644
> --- a/drivers/input/rmi4/rmi_driver.c
> +++ b/drivers/input/rmi4/rmi_driver.c
> @@ -205,7 +205,7 @@ static irqreturn_t rmi_irq_fn(int irq, void *dev_id)
>
> if (count) {
> kfree(attn_data.data);
> - attn_data.data = NULL;
> + drvdata->attn_data.data = NULL;
> }
>
> if (!kfifo_is_empty(&drvdata->attn_fifo))
> --
> 2.24.1
>

--
Dmitry

\
 
 \ /
  Last update: 2020-04-28 03:13    [W:0.071 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site