media: rc: uevent sysfs file races with rc_register_device()
Subsystems (3)
Sean Young
maintainerPATCH v2 1/2 media: rc: uevent sysfs file races with rc_register_device()
Only report uevent file contents if device still exists, else we might read freed memory.
Reported-by [email protected]
Cc Hillf Danton <[email protected]>
Cc <[email protected]> # 4.16
Signed-off-by Sean Young <[email protected]>
--- drivers/media/rc/rc-main.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/media/rc/rc-main.c +16 -16
@@ -1601,25 +1601,25 @@ static void rc_dev_release(struct device *device)kfree (dev); } -#define ADD_HOTPLUG_VAR(fmt, val...) \ - do { \ - int err = add_uevent_var(env, fmt, val); \ - if (err) \ - return err; \ - } while (0) -static int rc_dev_uevent (struct device *device,struct kobj_uevent_env *env) {struct rc_dev *dev =to_rc_dev (device); +int ret =0 ; -if (dev->rc_map.name) -ADD_HOTPLUG_VAR ("NAME=%s" , dev->rc_map.name); -if (dev->driver_name) -ADD_HOTPLUG_VAR ("DRV_NAME=%s" , dev->driver_name); -if (dev->device_name) -ADD_HOTPLUG_VAR ("DEV_NAME=%s" , dev->device_name); +mutex_lock (&dev->lock); -return 0 ; +if (!dev->registered) + ret = -ENODEV ; +if (ret ==0 && dev->rc_map.name) + ret =add_uevent_var (env,"NAME=%s" , dev->rc_map.name); +if (ret ==0 && dev->driver_name) + ret =add_uevent_var (env,"DRV_NAME=%s" , dev->driver_name); +if (ret ==0 && dev->device_name) + ret =add_uevent_var (env,"DEV_NAME=%s" , dev->device_name); + +mutex_unlock (&dev->lock); + +return ret; }/*
@@ -2011,14 +2011,14 @@ void rc_unregister_device(struct rc_dev *dev)del_timer_sync (&dev->timer_keyup);del_timer_sync (&dev->timer_repeat); -rc_free_rx_device (dev); -mutex_lock (&dev->lock);if (dev->users && dev->close) dev->close (dev); dev->registered = false;mutex_unlock (&dev->lock); +rc_free_rx_device (dev); +/* * lirc device should be freed with dev->registered = false, so * that userspace polling will get notified.
Signature · 1 line
2.26.2
Sean Young
maintainerPATCH v2 2/2 media: rc: do not access device via sysfs after rc_unregister_device()
Device drivers do not expect to have change_protocol or wakeup re-programming to be accesed after rc_unregister_device(). This can cause the device driver to access deallocated resources.
Cc <[email protected]> # 4.16
Signed-off-by Sean Young <[email protected]>
--- drivers/media/rc/rc-main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/media/rc/rc-main.c +12 -0
@@ -1292,6 +1292,10 @@ static ssize_t store_protocols(struct device *device, }mutex_lock (&dev->lock); +if (!dev->registered) { +mutex_unlock (&dev->lock); +return -ENODEV ; + } old_protocols = *current_protocols; new_protocols = old_protocols;
@@ -1430,6 +1434,10 @@ static ssize_t store_filter(struct device *device,return -EINVAL ;mutex_lock (&dev->lock); +if (!dev->registered) { +mutex_unlock (&dev->lock); +return -ENODEV ; + } new_filter = *filter;if (fattr->mask)
@@ -1544,6 +1552,10 @@ static ssize_t store_wakeup_protocols(struct device *device,int i;mutex_lock (&dev->lock); +if (!dev->registered) { +mutex_unlock (&dev->lock); +return -ENODEV ; + } allowed = dev->allowed_wakeup_protocols;
Signature · 1 line
2.26.2