i2c: dev: don't allow user-space to deadlock the kernel
Subsystems (2)
PATCH v2 1/1 i2c: dev: don't allow user-space to deadlock the kernel
From: Bartosz Golaszewski <[email protected]>
If we open an i2c character device and then unbind the underlying i2c adapter (either by unbinding it manually via sysfs or - for a real-life example - when unplugging a USB device with an i2c adaper), the kernel thread calling i2c_del_adapter() will become blocked waiting for the completion that only completes once all references to the character device get dropped.
In order to fix that, we introduce a couple changes. They need to be part of a single commit in order to preserve bisectability. First, drop the dev_release completion. That removes the risk of a deadlock but we now need to protect the character device structures against NULL pointer dereferences. To that end introduce an rw semaphore. It will protect the dummy i2c_client structure against dropping the adapter from under it. It will be taken for reading by all file_operations callbacks and for writing by the notifier's unbind handler. This way we don't prohibit the syscalls that don't get in each other's way from running concurrently but the adapter will not be unbound before all syscalls return.
Finally: upon being notified about an unbind event for the i2c adapter, we take the lock for writing and set the adapter pointer in the character device's structure to NULL. This "numbs down" the device - it still exists but is no longer functional. Meanwhile every syscall callback checks that pointer after taking the lock but before executing any code that requires it. If it's NULL, we return an error to user-space.
This way we can safely open an i2c device from user-space, unbind the device without triggering a deadlock and any subsequent system-call for the file descriptor associated with the removed adapter will gracefully fail.
---
v1 -> v2:
- make symbol names more descriptive
- protect the name_show() sysfs callback too
- zero the adapter's struct device on device release
- make sure the code works nicely with CONFIG_DEBUG_KOBJECT_RELEASE enabled
drivers/i2c/i2c-core-base.c | 32 ++++------- drivers/i2c/i2c-dev.c | 109 +++++++++++++++++++++++++++++++----- include/linux/i2c.h | 2 - 3 files changed, 106 insertions(+), 37 deletions(-)
drivers/i2c/i2c-core-base.c +11 -21
@@ -1139,7 +1139,17 @@ EXPORT_SYMBOL_GPL(i2c_new_ancillary_device);static void i2c_adapter_dev_release (struct device *dev) {struct i2c_adapter *adap =to_i2c_adapter (dev); -complete (&adap->dev_released); + +/* free bus id */ +mutex_lock (&core_lock); +idr_remove (&i2c_adapter_idr, adap->nr); +mutex_unlock (&core_lock); + +/* +* Clear the device structure in case this adapter is ever going to be +* added again. +*/ +memset (&adap->dev,0 ,sizeof (adap->dev)); }unsigned int i2c_adapter_depth (struct i2c_adapter *adapter)
@@ -1512,9 +1522,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)return 0 ; out_reg: -init_completion (&adap->dev_released);device_unregister (&adap->dev); -wait_for_completion (&adap->dev_released); out_list:mutex_lock (&core_lock);idr_remove (&i2c_adapter_idr, adap->nr);
@@ -1713,25 +1721,7 @@ void i2c_del_adapter(struct i2c_adapter *adap)i2c_host_notify_irq_teardown (adap); -/* wait until all references to the device are gone -* -* FIXME: This is old code and should ideally be replaced by an -* alternative which results in decoupling the lifetime of the struct -* device from the i2c_adapter, like spi or netdev do. Any solution -* should be thoroughly tested with DEBUG_KOBJECT_RELEASE enabled! -*/ -init_completion (&adap->dev_released);device_unregister (&adap->dev); -wait_for_completion (&adap->dev_released); - -/* free bus id */ -mutex_lock (&core_lock); -idr_remove (&i2c_adapter_idr, adap->nr); -mutex_unlock (&core_lock); - -/* Clear the device structure in case this adapter is ever going to be -added again */ -memset (&adap->dev,0 ,sizeof (adap->dev)); }EXPORT_SYMBOL (i2c_del_adapter);
drivers/i2c/i2c-dev.c +95 -14
234 lines not on this page · raw message
include/linux/i2c.h +0 -2
@@ -14,7 +14,6 @@#include <linux/bits.h> #include <linux/mod_devicetable.h> #include <linux/device.h> /* for struct device */ -#include <linux/sched.h> /* for completion */ #include <linux/mutex.h> #include <linux/regulator/consumer.h> #include <linux/rtmutex.h>
@@ -739,7 +738,6 @@ struct i2c_adapter {int nr;char name[48 ]; -struct completion dev_released;struct mutex userspace_clients_lock;struct list_head userspace_clients;
Signature · 1 line
2.37.2
Quoted 29 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
If we open an i2c character device and then unbind the underlying i2c adapter (either by unbinding it manually via sysfs or - for a real-life example - when unplugging a USB device with an i2c adaper), the kernel thread calling
i2c_del_adapter()will become blocked waiting for the completion that only completes once all references to the character device get dropped.In order to fix that, we introduce a couple changes. They need to be part of a single commit in order to preserve bisectability. First, drop the
dev_releasecompletion. That removes the risk of a deadlock but we now need to protect the character device structures against NULL pointer dereferences. To that end introduce an rw semaphore. It will protect the dummyi2c_clientstructure against dropping the adapter from under it. It will be taken for reading by allfile_operationscallbacks and for writing by the notifier's unbind handler. This way we don't prohibit the syscalls that don't get in each other's way from running concurrently but the adapter will not be unbound before all syscalls return.Finally: upon being notified about an unbind event for the i2c adapter, we take the lock for writing and set the adapter pointer in the character device's structure to NULL. This "numbs down" the device - it still exists but is no longer functional. Meanwhile every syscall callback checks that pointer after taking the lock but before executing any code that requires it. If it's NULL, we return an error to user-space.
Quoted 7 lines
This way we can safely open an i2c device from user-space, unbind the device without triggering a deadlock and any subsequent system-call for the file descriptor associated with the removed adapter will gracefully fail.
Signed-off-by Bartosz Golaszewski <[email protected]>---
Sorry for the noise, it was supposed to be v3.
Bart