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 16bdd4dd53911b2e8088dff927fd3cb89bf00c35 Author: dongjiuzhu1 <[email protected]> AuthorDate: Wed Dec 11 16:09:21 2024 +0800 drivers/sensors: Unregister the rpmsg lower half first. sensor_custom_unregister() reads upper from lower->priv, but with CONFIG_SENSORS_RPMSG the lower half registered by the driver is wrapped by sensor_rpmsg and lower->priv points to the sensor_rpmsg_dev_s, not to the upper half. The upper half pointer is wrong and unregistering a sensor crashes. sensor_rpmsg_unregister() also returned early when it was handed the driver's lower half instead of the rpmsg one, so the rpmsg device was leaked. Call sensor_rpmsg_unregister() before using lower->priv, let it restore lower->priv to the upper half and return the lower half, and drop the ops check that skipped the cleanup. Signed-off-by: dongjiuzhu1 <[email protected]> --- drivers/sensors/sensor.c | 8 ++++---- drivers/sensors/sensor_rpmsg.c | 12 ++++++------ include/nuttx/sensors/sensor.h | 5 ++++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/sensors/sensor.c b/drivers/sensors/sensor.c index 68b7064c7eb..52554c31115 100644 --- a/drivers/sensors/sensor.c +++ b/drivers/sensors/sensor.c @@ -1597,15 +1597,15 @@ void sensor_custom_unregister(FAR struct sensor_lowerhalf_s *lower, DEBUGASSERT(lower != NULL); DEBUGASSERT(lower->priv != NULL); +#ifdef CONFIG_SENSORS_RPMSG + lower = sensor_rpmsg_unregister(lower); +#endif + upper = lower->priv; sminfo(upper->name, "UnRegistering"); unregister_driver(path); -#ifdef CONFIG_SENSORS_RPMSG - sensor_rpmsg_unregister(lower); -#endif - nxrmutex_destroy(&upper->lock); if (circbuf_is_init(&upper->buffer)) { diff --git a/drivers/sensors/sensor_rpmsg.c b/drivers/sensors/sensor_rpmsg.c index 8e13f28be8d..3f275230843 100644 --- a/drivers/sensors/sensor_rpmsg.c +++ b/drivers/sensors/sensor_rpmsg.c @@ -1732,23 +1732,23 @@ sensor_rpmsg_register(FAR struct sensor_lowerhalf_s *lower, * Input Parameters: * lower - The instance of lower half sensor driver. * + * Returned Value: + * The takeover rpmsg lowerhalf returned on success, NULL on failure. ****************************************************************************/ -void sensor_rpmsg_unregister(FAR struct sensor_lowerhalf_s *lower) +FAR struct sensor_lowerhalf_s * +sensor_rpmsg_unregister(FAR struct sensor_lowerhalf_s *lower) { FAR struct sensor_rpmsg_dev_s *dev = lower->priv; - if (lower->ops != &g_sensor_rpmsg_ops) - { - return; - } - down_write(&g_dev_lock); list_delete(&dev->node); up_write(&g_dev_lock); nxsem_destroy(&dev->proxysem); + lower->priv = dev->upper; kmm_free(dev); + return lower; } /**************************************************************************** diff --git a/include/nuttx/sensors/sensor.h b/include/nuttx/sensors/sensor.h index 69ff24a1287..7b2d2fe31bc 100644 --- a/include/nuttx/sensors/sensor.h +++ b/include/nuttx/sensors/sensor.h @@ -809,10 +809,13 @@ FAR struct sensor_lowerhalf_s *sensor_rpmsg_register( * Input Parameters: * lower - The instance of lower half sensor driver. * + * Returned Value: + * The takeover rpmsg lowerhalf returned on success, NULL on failure. ****************************************************************************/ #ifdef CONFIG_SENSORS_RPMSG -void sensor_rpmsg_unregister(FAR struct sensor_lowerhalf_s *lower); +FAR struct sensor_lowerhalf_s * +sensor_rpmsg_unregister(FAR struct sensor_lowerhalf_s *lower); #endif /****************************************************************************
