* [PATCH] iio: adc: at91-sama5d2_adc: Fix use-after-free in sama5d2_adc driver
@ 2024-11-28 6:45 Pei Xiao
2024-11-28 7:26 ` Eugen Hristev
0 siblings, 1 reply; 8+ messages in thread
From: Pei Xiao @ 2024-11-28 6:45 UTC (permalink / raw)
To: eugen.hristev, jic23, lars, nicolas.ferre, linux-iio,
linux-arm-kernel, linux-kernel, alexandre.belloni
Cc: Pei Xiao
at91_adc_interrupt can call at91_adc_touch_data_handler function
to start the work by schedule_work(&st->touch_st.workq).
If we remove the module which will call at91_adc_remove to
make cleanup, it will free indio_dev through iio_device_unregister
while the work mentioned above will be used. The sequence of operations
that may lead to a UAF bug is as follows:
CPU0 CPU1
| at91_adc_workq_handler
at91_adc_remove |
iio_device_unregister(indio_dev) |
device_release |
//free indio_dev |
| iio_push_to_buffers(indio_dev)
| //use indio_dev
Fix it by ensuring that the work is canceled before proceeding with
the cleanup in at91_adc_remove.
Fixes: 27e177190891 ("iio:adc:at91_adc8xx: introduce new atmel adc driver")
Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
---
drivers/iio/adc/at91-sama5d2_adc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index 8e5aaf15a921..4ba52b500054 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -2491,6 +2491,7 @@ static void at91_adc_remove(struct platform_device *pdev)
struct iio_dev *indio_dev = platform_get_drvdata(pdev);
struct at91_adc_state *st = iio_priv(indio_dev);
+ cancel_work_sync(&st->touch_st.workq);
iio_device_unregister(indio_dev);
at91_adc_dma_disable(st);
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] iio: adc: at91-sama5d2_adc: Fix use-after-free in sama5d2_adc driver
2024-11-28 6:45 [PATCH] iio: adc: at91-sama5d2_adc: Fix use-after-free in sama5d2_adc driver Pei Xiao
@ 2024-11-28 7:26 ` Eugen Hristev
2025-10-11 7:10 ` [PATCH] iio: adc: ti_am335x_adc: Limit step_avg to valid range for gcc complains Pei Xiao
2025-10-20 7:49 ` [PATCH v2] iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver Pei Xiao
0 siblings, 2 replies; 8+ messages in thread
From: Eugen Hristev @ 2024-11-28 7:26 UTC (permalink / raw)
To: Pei Xiao, jic23, lars, nicolas.ferre, linux-iio, linux-arm-kernel,
linux-kernel, alexandre.belloni
Hello,
On 11/28/24 08:45, Pei Xiao wrote:
> at91_adc_interrupt can call at91_adc_touch_data_handler function
> to start the work by schedule_work(&st->touch_st.workq).
>
> If we remove the module which will call at91_adc_remove to
> make cleanup, it will free indio_dev through iio_device_unregister
> while the work mentioned above will be used. The sequence of operations
> that may lead to a UAF bug is as follows:
>
> CPU0 CPU1
>
> | at91_adc_workq_handler
> at91_adc_remove |
> iio_device_unregister(indio_dev) |
> device_release |
> //free indio_dev |
> | iio_push_to_buffers(indio_dev)
> | //use indio_dev
>
> Fix it by ensuring that the work is canceled before proceeding with
> the cleanup in at91_adc_remove.
>
> Fixes: 27e177190891 ("iio:adc:at91_adc8xx: introduce new atmel adc driver")
I believe that the commit that introduced the workqueue is different
than the one you tagged here.
With that changed,
Reviewed-by: Eugen Hristev <eugen.hristev@linaro.org>
> Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
> ---
> drivers/iio/adc/at91-sama5d2_adc.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
> index 8e5aaf15a921..4ba52b500054 100644
> --- a/drivers/iio/adc/at91-sama5d2_adc.c
> +++ b/drivers/iio/adc/at91-sama5d2_adc.c
> @@ -2491,6 +2491,7 @@ static void at91_adc_remove(struct platform_device *pdev)
> struct iio_dev *indio_dev = platform_get_drvdata(pdev);
> struct at91_adc_state *st = iio_priv(indio_dev);
>
> + cancel_work_sync(&st->touch_st.workq);
> iio_device_unregister(indio_dev);
>
> at91_adc_dma_disable(st);
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] iio: adc: ti_am335x_adc: Limit step_avg to valid range for gcc complains
@ 2025-10-11 7:10 ` Pei Xiao
2025-10-12 19:16 ` Jonathan Cameron
2025-10-20 9:26 ` Pei Xiao
0 siblings, 2 replies; 8+ messages in thread
From: Pei Xiao @ 2025-10-11 7:10 UTC (permalink / raw)
To: jic23, dlechner, nuno.sa, andy, linux-iio, linux-kernel
Cc: Pei Xiao, kernel test robot
FIELD_PREP() checks that a value fits into the available bitfield, add a
check for step_avg to fix gcc complains.
which gcc complains about:
drivers/iio/adc/ti_am335x_adc.c: In function 'tiadc_step_config':
include/linux/compiler_types.h:572:38: error: call to
'__compiletime_assert_491' declared with attribute error: FIELD_PREP: value
too large for the field include/linux/mfd/ti_am335x_tscadc.h:58:29: note:
in expansion of macro 'FIELD_PREP'
#define STEPCONFIG_AVG(val) FIELD_PREP(GENMASK(4, 2), (val))
^~~~~~~~~~
drivers/iio/adc/ti_am335x_adc.c:127:17: note: in expansion of macro 'STEPCONFIG_AVG'
stepconfig = STEPCONFIG_AVG(ffs(adc_dev->step_avg[i]) - 1)
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202510102117.Jqxrw1vF-lkp@intel.com/
Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
---
drivers/iio/adc/ti_am335x_adc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 99f274adc870..45bdd57bfdc2 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -123,7 +123,7 @@ static void tiadc_step_config(struct iio_dev *indio_dev)
chan = adc_dev->channel_line[i];
- if (adc_dev->step_avg[i])
+ if (adc_dev->step_avg[i] && adc_dev->step_avg[i] < STEPCONFIG_AVG_16)
stepconfig = STEPCONFIG_AVG(ffs(adc_dev->step_avg[i]) - 1) |
STEPCONFIG_FIFO1;
else
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] iio: adc: ti_am335x_adc: Limit step_avg to valid range for gcc complains
2025-10-11 7:10 ` [PATCH] iio: adc: ti_am335x_adc: Limit step_avg to valid range for gcc complains Pei Xiao
@ 2025-10-12 19:16 ` Jonathan Cameron
2025-10-20 9:26 ` Pei Xiao
1 sibling, 0 replies; 8+ messages in thread
From: Jonathan Cameron @ 2025-10-12 19:16 UTC (permalink / raw)
To: Pei Xiao
Cc: dlechner, nuno.sa, andy, linux-iio, linux-kernel,
kernel test robot
On Sat, 11 Oct 2025 15:10:51 +0800
Pei Xiao <xiaopei01@kylinos.cn> wrote:
> FIELD_PREP() checks that a value fits into the available bitfield, add a
> check for step_avg to fix gcc complains.
>
> which gcc complains about:
> drivers/iio/adc/ti_am335x_adc.c: In function 'tiadc_step_config':
> include/linux/compiler_types.h:572:38: error: call to
> '__compiletime_assert_491' declared with attribute error: FIELD_PREP: value
> too large for the field include/linux/mfd/ti_am335x_tscadc.h:58:29: note:
> in expansion of macro 'FIELD_PREP'
> #define STEPCONFIG_AVG(val) FIELD_PREP(GENMASK(4, 2), (val))
> ^~~~~~~~~~
> drivers/iio/adc/ti_am335x_adc.c:127:17: note: in expansion of macro 'STEPCONFIG_AVG'
> stepconfig = STEPCONFIG_AVG(ffs(adc_dev->step_avg[i]) - 1)
A bit irritating but fair enough that the compiler would have to see a long way to know
that it always fits.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202510102117.Jqxrw1vF-lkp@intel.com/
> Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
> ---
> drivers/iio/adc/ti_am335x_adc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
> index 99f274adc870..45bdd57bfdc2 100644
> --- a/drivers/iio/adc/ti_am335x_adc.c
> +++ b/drivers/iio/adc/ti_am335x_adc.c
> @@ -123,7 +123,7 @@ static void tiadc_step_config(struct iio_dev *indio_dev)
>
> chan = adc_dev->channel_line[i];
>
> - if (adc_dev->step_avg[i])
> + if (adc_dev->step_avg[i] && adc_dev->step_avg[i] < STEPCONFIG_AVG_16)
why < rather than <=?
STEPCONFIG_AVG_16 is the default.
> stepconfig = STEPCONFIG_AVG(ffs(adc_dev->step_avg[i]) - 1) |
> STEPCONFIG_FIFO1;
> else
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver
2024-11-28 7:26 ` Eugen Hristev
2025-10-11 7:10 ` [PATCH] iio: adc: ti_am335x_adc: Limit step_avg to valid range for gcc complains Pei Xiao
@ 2025-10-20 7:49 ` Pei Xiao
2025-10-27 13:49 ` Jonathan Cameron
1 sibling, 1 reply; 8+ messages in thread
From: Pei Xiao @ 2025-10-20 7:49 UTC (permalink / raw)
To: eugen.hristev
Cc: alexandre.belloni, jic23, lars, linux-arm-kernel, linux-iio,
linux-kernel, nicolas.ferre, xiaopei01
at91_adc_interrupt can call at91_adc_touch_data_handler function
to start the work by schedule_work(&st->touch_st.workq).
If we remove the module which will call at91_adc_remove to
make cleanup, it will free indio_dev through iio_device_unregister
while the work mentioned above will be used. The sequence of operations
that may lead to a UAF bug is as follows:
CPU0 CPU1
| at91_adc_workq_handler
at91_adc_remove |
iio_device_unregister(indio_dev) |
//free indio_dev |
| iio_push_to_buffers(indio_dev)
| //use indio_dev
Fix it by ensuring that the work is canceled before proceeding with
the cleanup in at91_adc_remove.
Fixes: 3ec2774f1cc ("iio: adc: at91-sama5d2_adc: add support for position and pressure channels")
Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
---
drivers/iio/adc/at91-sama5d2_adc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
index b4c36e6a7490..1cd6ce61cf17 100644
--- a/drivers/iio/adc/at91-sama5d2_adc.c
+++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -2480,6 +2480,7 @@ static void at91_adc_remove(struct platform_device *pdev)
struct iio_dev *indio_dev = platform_get_drvdata(pdev);
struct at91_adc_state *st = iio_priv(indio_dev);
+ cancel_work_sync(&st->touch_st.workq);
iio_device_unregister(indio_dev);
at91_adc_dma_disable(st);
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH] iio: adc: ti_am335x_adc: Limit step_avg to valid range for gcc complains
2025-10-11 7:10 ` [PATCH] iio: adc: ti_am335x_adc: Limit step_avg to valid range for gcc complains Pei Xiao
2025-10-12 19:16 ` Jonathan Cameron
@ 2025-10-20 9:26 ` Pei Xiao
1 sibling, 0 replies; 8+ messages in thread
From: Pei Xiao @ 2025-10-20 9:26 UTC (permalink / raw)
To: eugen.hristev
Cc: alexandre.belloni, jic23, lars, linux-arm-kernel, linux-iio,
linux-kernel, nicolas.ferre, xiaopei01
On 11/28/24 08:45, Pei Xiao wrote:
>> at91_adc_interrupt can call at91_adc_touch_data_handler function
>> to start the work by schedule_work(&st->touch_st.workq).
>>
>> If we remove the module which will call at91_adc_remove to
>> make cleanup, it will free indio_dev through iio_device_unregister
>> while the work mentioned above will be used. The sequence of operations
>> that may lead to a UAF bug is as follows:
>>
>> CPU0 CPU1
>
> | at91_adc_workq_handler
>> at91_adc_remove |
>> iio_device_unregister(indio_dev) |
>> device_release |
>> //free indio_dev |
> | iio_push_to_buffers(indio_dev)
> | //use indio_dev
>
> Fix it by ensuring that the work is canceled before proceeding with
> the cleanup in at91_adc_remove.
>>
>> Fixes: 27e177190891 ("iio:adc:at91_adc8xx: introduce new atmel adc driver")
>I believe that the commit that introduced the workqueue is different
>than the one you tagged here.
>With that changed,
>Reviewed-by: Eugen Hristev <eugen.hristev@linaro.org>
I am so sorry I have been ignoring this reply for almost a year..
>> Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
>> ---
>> drivers/iio/adc/at91-sama5d2_adc.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
>> index 8e5aaf15a921..4ba52b500054 100644
>> --- a/drivers/iio/adc/at91-sama5d2_adc.c
>> +++ b/drivers/iio/adc/at91-sama5d2_adc.c
>> @@ -2491,6 +2491,7 @@ static void at91_adc_remove(struct platform_device *pdev)
>> struct iio_dev *indio_dev = platform_get_drvdata(pdev);
>> struct at91_adc_state *st = iio_priv(indio_dev);
>>
>> + cancel_work_sync(&st->touch_st.workq);
>> iio_device_unregister(indio_dev);
>>
>> at91_adc_dma_disable(st);
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver
2025-10-20 7:49 ` [PATCH v2] iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver Pei Xiao
@ 2025-10-27 13:49 ` Jonathan Cameron
2025-10-28 1:51 ` Pei Xiao
0 siblings, 1 reply; 8+ messages in thread
From: Jonathan Cameron @ 2025-10-27 13:49 UTC (permalink / raw)
To: Pei Xiao
Cc: eugen.hristev, alexandre.belloni, lars, linux-arm-kernel,
linux-iio, linux-kernel, nicolas.ferre
On Mon, 20 Oct 2025 15:49:25 +0800
Pei Xiao <xiaopei01@kylinos.cn> wrote:
> at91_adc_interrupt can call at91_adc_touch_data_handler function
> to start the work by schedule_work(&st->touch_st.workq).
>
> If we remove the module which will call at91_adc_remove to
> make cleanup, it will free indio_dev through iio_device_unregister
> while the work mentioned above will be used. The sequence of operations
> that may lead to a UAF bug is as follows:
>
> CPU0 CPU1
>
> | at91_adc_workq_handler
> at91_adc_remove |
> iio_device_unregister(indio_dev) |
> //free indio_dev |
> | iio_push_to_buffers(indio_dev)
> | //use indio_dev
Hi,
I'm not completely following your description here.
The free doesn't happen in iio_device_unregister() but quite a bit later.
So either the problem you are seeing is actually devm_ tear down that
will do the free, or it's a more specific action in iio_device_unregister()
though I'm not sure what it might be. Possibly a specific buffer mask
getting torn down? I haven't analysed it closely enough to figure out if
there is a race there but it's the only thing I can immediately spot that
would even be of interest to a work item in a driver via some core interfaces.
Other than working out exact cause for anyone looking at this later, I'm
also not sure you don't leave a potential race where a fresh request comes in
between that cancel_work_sync() and the iio_device_unregister() call as it
is only when iio_device_unregister() is complete that all interfaces are torn
down that could start a fresh capture.
So were the cancel_work_sync() one line later I would have been happy but
from your description I'm not sure that fixes the bug you are seeing!
Jonathan
>
> Fix it by ensuring that the work is canceled before proceeding with
> the cleanup in at91_adc_remove.
>
> Fixes: 3ec2774f1cc ("iio: adc: at91-sama5d2_adc: add support for position and pressure channels")
> Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
> ---
> drivers/iio/adc/at91-sama5d2_adc.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
> index b4c36e6a7490..1cd6ce61cf17 100644
> --- a/drivers/iio/adc/at91-sama5d2_adc.c
> +++ b/drivers/iio/adc/at91-sama5d2_adc.c
> @@ -2480,6 +2480,7 @@ static void at91_adc_remove(struct platform_device *pdev)
> struct iio_dev *indio_dev = platform_get_drvdata(pdev);
> struct at91_adc_state *st = iio_priv(indio_dev);
>
> + cancel_work_sync(&st->touch_st.workq);
> iio_device_unregister(indio_dev);
>
> at91_adc_dma_disable(st);
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver
2025-10-27 13:49 ` Jonathan Cameron
@ 2025-10-28 1:51 ` Pei Xiao
0 siblings, 0 replies; 8+ messages in thread
From: Pei Xiao @ 2025-10-28 1:51 UTC (permalink / raw)
To: jic23; +Cc: alexandre.belloni, eugen.hristev, linux-iio, linux-kernel
> On Mon, 20 Oct 2025 15:49:25 +0800
> Pei Xiao <xiaopei01@kylinos.cn> wrote:
>
> > at91_adc_interrupt can call at91_adc_touch_data_handler function
> > to start the work by schedule_work(&st->touch_st.workq).
> >
> > If we remove the module which will call at91_adc_remove to
> > make cleanup, it will free indio_dev through iio_device_unregister
> > while the work mentioned above will be used. The sequence of operations
> > that may lead to a UAF bug is as follows:
> >
> > CPU0 CPU1
> >
> > | at91_adc_workq_handler
> > at91_adc_remove |
> > iio_device_unregister(indio_dev) |
> > //free indio_dev |
> > | iio_push_to_buffers(indio_dev)
> > | //use indio_dev
>
> Hi,
>
> I'm not completely following your description here.
> The free doesn't happen in iio_device_unregister() but quite a bit later.
> So either the problem you are seeing is actually devm_ tear down that
> will do the free, or it's a more specific action in iio_device_unregister()
> though I'm not sure what it might be. Possibly a specific buffer mask
> getting torn down? I haven't analysed it closely enough to figure out if
> there is a race there but it's the only thing I can immediately spot that
> would even be of interest to a work item in a driver via some core interfaces.
>
> Other than working out exact cause for anyone looking at this later, I'm
> also not sure you don't leave a potential race where a fresh request comes in
> between that cancel_work_sync() and the iio_device_unregister() call as it
> is only when iio_device_unregister() is complete that all interfaces are torn
> down that could start a fresh capture.
>
> So were the cancel_work_sync() one line later I would have been happy but
> from your description I'm not sure that fixes the bug you are seeing!
>
> Jonathan
Hi,
Thank you for your reply email.
I haven't tested this bug, but I noticed this potential issue while
reading the code. So, can I send the v3 patch and move the
cancel_work_sync to the next line of code?
Thanks!
Pei.
>
>
>
> >
> > Fix it by ensuring that the work is canceled before proceeding with
> > the cleanup in at91_adc_remove.
> >
> > Fixes: 3ec2774f1cc ("iio: adc: at91-sama5d2_adc: add support for position and pressure channels")
> > Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
> > ---
> > drivers/iio/adc/at91-sama5d2_adc.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
> > index b4c36e6a7490..1cd6ce61cf17 100644
> > --- a/drivers/iio/adc/at91-sama5d2_adc.c
> > +++ b/drivers/iio/adc/at91-sama5d2_adc.c
> > @@ -2480,6 +2480,7 @@ static void at91_adc_remove(struct platform_device *pdev)
> > struct iio_dev *indio_dev = platform_get_drvdata(pdev);
> > struct at91_adc_state *st = iio_priv(indio_dev);
> >
> > + cancel_work_sync(&st->touch_st.workq);
> > iio_device_unregister(indio_dev);
> >
> > at91_adc_dma_disable(st);
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-10-28 1:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-28 6:45 [PATCH] iio: adc: at91-sama5d2_adc: Fix use-after-free in sama5d2_adc driver Pei Xiao
2024-11-28 7:26 ` Eugen Hristev
2025-10-11 7:10 ` [PATCH] iio: adc: ti_am335x_adc: Limit step_avg to valid range for gcc complains Pei Xiao
2025-10-12 19:16 ` Jonathan Cameron
2025-10-20 9:26 ` Pei Xiao
2025-10-20 7:49 ` [PATCH v2] iio: adc: at91-sama5d2_adc: Fix potential use-after-free in sama5d2_adc driver Pei Xiao
2025-10-27 13:49 ` Jonathan Cameron
2025-10-28 1:51 ` Pei Xiao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox