This is an automated email from the ASF dual-hosted git repository. GUIDINGLI pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit bbc8591d2e220cf6a37df70a9608de689efe6468 Author: likun17 <[email protected]> AuthorDate: Fri Jun 20 17:16:23 2025 +0800 drivers/sensors: Refuse to unregister a sensor that is in use. sensor_custom_unregister() unregisters the driver and frees the upper half even when users still have the topic open, so the next access from those users uses freed memory. usensor_unregister() also removes the user sensor from its list before knowing whether the unregister succeeded. * Return -EBUSY from sensor_custom_unregister() and sensor_rpmsg_unregister() while the topic has subscribers or advertisers other than the physical sensor itself. * Return an error code from sensor_unregister() and sensor_custom_unregister() instead of void. * usensor: keep the node on its list and report the error when the unregister fails. Signed-off-by: likun17 <[email protected]> --- drivers/sensors/sensor.c | 35 ++++++++++++++++++++++++++++------- drivers/sensors/sensor_rpmsg.c | 8 ++++++++ drivers/sensors/usensor.c | 11 +++++++++-- include/nuttx/sensors/sensor.h | 12 +++++++++--- 4 files changed, 54 insertions(+), 12 deletions(-) diff --git a/drivers/sensors/sensor.c b/drivers/sensors/sensor.c index ec2416a75ec..00c365d13a7 100644 --- a/drivers/sensors/sensor.c +++ b/drivers/sensors/sensor.c @@ -1556,23 +1556,28 @@ rpmsg_err: * as the driver persists. * devno - The user specifies which device of this type, from 0. * + * Returned Value: + * OK if the driver was successfully unregister; A negated errno value is + * returned on any failure. ****************************************************************************/ -void sensor_unregister(FAR struct sensor_lowerhalf_s *lower, int devno) +int sensor_unregister(FAR struct sensor_lowerhalf_s *lower, int devno) { FAR char *path; + int ret; path = lib_get_pathbuffer(); if (path == NULL) { - return; + return -ENOMEM; } snprintf(path, PATH_MAX, DEVNAME_FMT, g_sensor_meta[lower->type].name, devno); - sensor_custom_unregister(lower, path); + ret = sensor_custom_unregister(lower, path); lib_put_pathbuffer(path); + return ret; } /**************************************************************************** @@ -1588,10 +1593,13 @@ void sensor_unregister(FAR struct sensor_lowerhalf_s *lower, int devno) * as the driver persists. * path - The user specifies path of device, ex: /dev/uorb/xxx * + * Returned Value: + * OK if the driver was successfully unregister; A negated errno value is + * returned on any failure. ****************************************************************************/ -void sensor_custom_unregister(FAR struct sensor_lowerhalf_s *lower, - FAR const char *path) +int sensor_custom_unregister(FAR struct sensor_lowerhalf_s *lower, + FAR const char *path) { FAR struct sensor_upperhalf_s *upper; @@ -1600,13 +1608,25 @@ void sensor_custom_unregister(FAR struct sensor_lowerhalf_s *lower, #ifdef CONFIG_SENSORS_RPMSG lower = sensor_rpmsg_unregister(lower); + if (lower == NULL) + { + return -EBUSY; + } + #endif upper = lower->priv; - sminfo(upper->name, "UnRegistering"); - unregister_driver(path); + /* A physical sensor is its own advertiser, see sensor_custom_register */ + + if (upper->state.nsubscribers != 0 || + upper->state.nadvertisers > (lower->ops->activate ? 1 : 0)) + { + return -EBUSY; + } + + unregister_driver(path); nxrmutex_destroy(&upper->lock); if (circbuf_is_init(&upper->buffer)) { @@ -1615,4 +1635,5 @@ void sensor_custom_unregister(FAR struct sensor_lowerhalf_s *lower, } kmm_free(upper); + return OK; } diff --git a/drivers/sensors/sensor_rpmsg.c b/drivers/sensors/sensor_rpmsg.c index 47d48d31de0..60a3d3406ef 100644 --- a/drivers/sensors/sensor_rpmsg.c +++ b/drivers/sensors/sensor_rpmsg.c @@ -1749,6 +1749,14 @@ sensor_rpmsg_unregister(FAR struct sensor_lowerhalf_s *lower) { FAR struct sensor_rpmsg_dev_s *dev = lower->priv; + /* A physical sensor is its own advertiser, see sensor_rpmsg_register */ + + if (dev->nsubscribers != 0 || + dev->nadvertisers > (dev->drv->ops->activate ? 1 : 0)) + { + return NULL; + } + down_write(&g_dev_lock); list_delete(&dev->node); up_write(&g_dev_lock); diff --git a/drivers/sensors/usensor.c b/drivers/sensors/usensor.c index ddb42202bbe..30f2afdc1bb 100644 --- a/drivers/sensors/usensor.c +++ b/drivers/sensors/usensor.c @@ -163,9 +163,16 @@ static int usensor_unregister(FAR struct usensor_context_s *usensor, { if (strcmp(path, lower->path) == 0) { - list_delete(&lower->node); nxmutex_unlock(&usensor->lock); - sensor_custom_unregister(&lower->driver, path); + ret = sensor_custom_unregister(&lower->driver, path); + if (ret < 0) + { + snerr("ERROR: Topic %s unregister failed! return:%d", + lower->path, ret); + return ret; + } + + list_delete(&lower->node); kmm_free(lower); return 0; } diff --git a/include/nuttx/sensors/sensor.h b/include/nuttx/sensors/sensor.h index 7b2d2fe31bc..7f981e0d019 100644 --- a/include/nuttx/sensors/sensor.h +++ b/include/nuttx/sensors/sensor.h @@ -740,9 +740,12 @@ int sensor_custom_register(FAR struct sensor_lowerhalf_s *dev, * as the driver persists. * devno - The user specifies which device of this type, from 0. * + * Returned Value: + * OK if the driver was successfully unregister; A negated errno value is + * returned on any failure. ****************************************************************************/ -void sensor_unregister(FAR struct sensor_lowerhalf_s *dev, int devno); +int sensor_unregister(FAR struct sensor_lowerhalf_s *dev, int devno); /**************************************************************************** * Name: sensor_custom_unregister @@ -757,10 +760,13 @@ void sensor_unregister(FAR struct sensor_lowerhalf_s *dev, int devno); * as the driver persists. * path - The user specifies path of device, ex: /dev/uorb/xxx * + * Returned Value: + * OK if the driver was successfully unregister; A negated errno value is + * returned on any failure. ****************************************************************************/ -void sensor_custom_unregister(FAR struct sensor_lowerhalf_s *dev, - FAR const char *path); +int sensor_custom_unregister(FAR struct sensor_lowerhalf_s *dev, + FAR const char *path); /**************************************************************************** * Name: usensor_initialize
