Skip to contentSkip to conversation

iio: trigger: sysfs: fix use-after-free on remove

PATCH In review Vincent Whitchurch 3 participants 3 messages May 19, 2022 – May 22, 2022 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: trigger: sysfs: fix use-after-free on remove

Ensure that the irq_work has completed before the trigger is freed.

==================================================================

 BUG: KASAN: use-after-free in irq_work_run_list
 Read of size 8 at addr 0000000064702248 by task python3/25

 Call Trace:
  irq_work_run_list
  irq_work_tick
  update_process_times
  tick_sched_handle
  tick_sched_timer
  __hrtimer_run_queues
  hrtimer_interrupt

 Allocated by task 25:
  kmem_cache_alloc_trace
  iio_sysfs_trig_add
  dev_attr_store
  sysfs_kf_write
  kernfs_fop_write_iter
  new_sync_write
  vfs_write
  ksys_write
  sys_write

 Freed by task 25:
  kfree
  iio_sysfs_trig_remove
  dev_attr_store
  sysfs_kf_write
  kernfs_fop_write_iter
  new_sync_write
  vfs_write
  ksys_write
  sys_write

==================================================================

Fixes e64e7d5c8c86e ("iio:trigger:sysfs Move out of staging.")
---
 drivers/iio/trigger/iio-trig-sysfs.c | 1 +
 1 file changed, 1 insertion(+)
drivers/iio/trigger/iio-trig-sysfs.c +1 -0
index 2a4b75897910..3d911c24b265 100644
@@ -191,6 +191,7 @@ static int iio_sysfs_trigger_remove(int id)
 	}
 
 	iio_trigger_unregister(t->trig);
+	irq_work_sync(&t->work);
 	iio_trigger_free(t->trig);
 
 	list_del(&t->l);
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Vincent Whitchurch

[...]

Fixes e64e7d5c8c86e ("iio:trigger:sysfs Move out of staging.")

Thanks for the patch!

Strictly speaking the Fixes: should be

f38bc926d022 ("staging:iio:sysfs-trigger: Use irq_work to properly active trigger")

Quoted 16 lines
---
  drivers/iio/trigger/iio-trig-sysfs.c | 1 +
  1 file changed, 1 insertion(+)
drivers/iio/trigger/iio-trig-sysfs.c +1 -0
index 2a4b75897910..3d911c24b265 100644
@@ -191,6 +191,7 @@ static int iio_sysfs_trigger_remove(int id)
  	}
 
  	iio_trigger_unregister(t->trig);
+	irq_work_sync(&t->work);
  	iio_trigger_free(t->trig);
 
  	list_del(&t->l);
maintainer
#2 lore raw
Quoted 9 lines · On Thu, 19 May 2022 11:58:03 +0200 Lars-Peter Clausen <[email protected]> wrote:
Quoted 5 lines · Vincent Whitchurch

[...]

Fixes e64e7d5c8c86e ("iio:trigger:sysfs Move out of staging.")

Thanks for the patch!

Quoted 7 lines

Strictly speaking the Fixes: should be

f38bc926d022 ("staging:iio:sysfs-trigger: Use irq_work to properly active trigger")

I've changed the fixes tag and applied to the fixes-togreg branch of iio.git.

Thanks,

Jonathan

Quoted 19 lines
Quoted 17 lines
---
  drivers/iio/trigger/iio-trig-sysfs.c | 1 +
  1 file changed, 1 insertion(+)
drivers/iio/trigger/iio-trig-sysfs.c +1 -0
index 2a4b75897910..3d911c24b265 100644
@@ -191,6 +191,7 @@ static int iio_sysfs_trigger_remove(int id)
  	}
 
  	iio_trigger_unregister(t->trig);
+	irq_work_sync(&t->work);
  	iio_trigger_free(t->trig);
 
  	list_del(&t->l);