Skip to contentSkip to conversation

most: core: fix resource leak in most_register_interface error paths

PATCH Superseded Navaneeth K 2 participants 7 messages Nov 25, 2025 – Nov 26, 2025

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover most: core: fix resource leak in most_register_interface error paths

This series fixes a resource leak in most_register_interface() where early errors (allocation failures) would return without releasing the device, leaking memory.

It switches to the split device_initialize() + device_add() pattern to ensure put_device() can be safely called on all error paths.

It also updates the most_usb driver to remove manual error handling that would otherwise cause a double-free with the new core logic.

Changes in v2:
- Replaced the previous single-driver fix ("staging: most: dim2: fix missing cleanup...") which was NACKed because it introduced a double-free risk.
- Moved the fix to the Core (core.c) to handle cleanup centrally via

    put_device().

- Updated most_usb.c to remove conflicting manual cleanup.
- Dropped the dim2.c patch as the upstream code is already correct for this new core logic (it relies on the release callback, which core now triggers).

Navaneeth K (2):
most: core: fix resource leak in most_register_interface error paths
most: usb: remove double cleanup of interface on registration failure

 drivers/most/core.c     |  9 +++++++--
 drivers/most/most_usb.c | 11 +++--------
 2 files changed, 10 insertions(+), 10 deletions(-)
#1 lore raw

PATCH v2 1/2 most: core: fix resource leak in most_register_interface error paths

The function most_register_interface() did not correctly release resources if it failed early (before device_register). In these cases, it returned an error code immediately, leaking the memory allocated for the interface.

Fix this by initializing the device early via device_initialize() and calling put_device() on all error paths. This ensures the release callback is triggered to free memory.

Switch to using device_add() instead of device_register() to handle the split initialization.

---
 drivers/most/core.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/most/core.c +7 -2
index da319d108ea1d..8635fd08035e9 100644
@@ -1283,18 +1283,23 @@ int most_register_interface(struct most_interface *iface)
 	struct most_channel *c;
 
 	if (!iface || !iface->enqueue || !iface->configure ||
-	    !iface->poison_channel || (iface->num_channels > MAX_CHANNELS))
+	    !iface->poison_channel || (iface->num_channels > MAX_CHANNELS) ||
+	    !iface->dev)
 		return -EINVAL;
 
+	device_initialize(iface->dev);
+
 	id = ida_alloc(&mdev_id, GFP_KERNEL);
 	if (id < 0) {
 		dev_err(iface->dev, "Failed to allocate device ID\n");
+		put_device(iface->dev);
 		return id;
 	}
 
 	iface->p = kzalloc(sizeof(*iface->p), GFP_KERNEL);
 	if (!iface->p) {
 		ida_free(&mdev_id, id);
+		put_device(iface->dev);
 		return -ENOMEM;
 	}
 
@@ -1304,7 +1309,7 @@ int most_register_interface(struct most_interface *iface)
 	iface->dev->bus = &mostbus;
 	iface->dev->groups = interface_attr_groups;
 	dev_set_drvdata(iface->dev, iface);
-	if (device_register(iface->dev)) {
+	if (device_add(iface->dev)) {
 		dev_err(iface->dev, "Failed to register interface device\n");
 		kfree(iface->p);
 		put_device(iface->dev);
Signature · 1 line
2.43.0
#2 lore raw

Apologies, I missed adding the credit for the original finding.
If a v3 is needed for other reasons, I will include it. Otherwise, if this is merged, please add:

Quoted 54 lines · Navaneeth K

The function most_register_interface() did not correctly release resources if it failed early (before device_register). In these cases, it returned an error code immediately, leaking the memory allocated for the interface.

Fix this by initializing the device early via device_initialize() and calling put_device() on all error paths. This ensures the release callback is triggered to free memory.

Switch to using device_add() instead of device_register() to handle the split initialization.

---
  drivers/most/core.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
drivers/most/core.c +7 -2
index da319d108ea1d..8635fd08035e9 100644
@@ -1283,18 +1283,23 @@ int most_register_interface(struct most_interface *iface)
  	struct most_channel *c;
 
  	if (!iface || !iface->enqueue || !iface->configure ||
-	    !iface->poison_channel || (iface->num_channels > MAX_CHANNELS))
+	    !iface->poison_channel || (iface->num_channels > MAX_CHANNELS) ||
+	    !iface->dev)
  		return -EINVAL;
 
+	device_initialize(iface->dev);
+
  	id = ida_alloc(&mdev_id, GFP_KERNEL);
  	if (id < 0) {
  		dev_err(iface->dev, "Failed to allocate device ID\n");
+		put_device(iface->dev);
  		return id;
  	}
 
  	iface->p = kzalloc(sizeof(*iface->p), GFP_KERNEL);
  	if (!iface->p) {
  		ida_free(&mdev_id, id);
+		put_device(iface->dev);
  		return -ENOMEM;
  	}
 
@@ -1304,7 +1309,7 @@ int most_register_interface(struct most_interface *iface)
  	iface->dev->bus = &mostbus;
  	iface->dev->groups = interface_attr_groups;
  	dev_set_drvdata(iface->dev, iface);
-	if (device_register(iface->dev)) {
+	if (device_add(iface->dev)) {
  		dev_err(iface->dev, "Failed to register interface device\n");
  		kfree(iface->p);
  		put_device(iface->dev);
Acked-by on v2 1/2
#3 lore raw
In reply to Navaneeth K
Quoted 10 lines · Navaneeth K

The function most_register_interface() did not correctly release resources if it failed early (before device_register). In these cases, it returned an error code immediately, leaking the memory allocated for the interface.

Fix this by initializing the device early via device_initialize() and calling put_device() on all error paths. This ensures the release callback is triggered to free memory.

Switch to using device_add() instead of device_register() to handle the split initialization.

#4 lore raw

PATCH v2 2/2 most: usb: remove double cleanup of interface on registration failure

In reply to Navaneeth K

Since most_register_interface() now correctly handles cleanup (calling put_device on failure), the manual cleanup in hdm_probe() would cause a double-free.

Remove the manual cleanup labels and return the error code directly.

---
 drivers/most/most_usb.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/most/most_usb.c +4 -9
index 10064d7b72498..597cf7f4e6b90 100644
@@ -1058,7 +1058,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
 
 	ret = most_register_interface(&mdev->iface);
 	if (ret)
-		goto err_free_busy_urbs;
+		return ret;
 
 	mutex_lock(&mdev->io_mutex);
 	if (le16_to_cpu(usb_dev->descriptor.idProduct) == USB_DEV_ID_OS81118 ||
@@ -1068,8 +1068,7 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
 		if (!mdev->dci) {
 			mutex_unlock(&mdev->io_mutex);
 			most_deregister_interface(&mdev->iface);
-			ret = -ENOMEM;
-			goto err_free_busy_urbs;
+			return -ENOMEM;
 		}
 
 		mdev->dci->dev.init_name = "dci";
@@ -1077,19 +1076,15 @@ hdm_probe(struct usb_interface *interface, const struct usb_device_id *id)
 		mdev->dci->dev.groups = dci_groups;
 		mdev->dci->dev.release = release_dci;
 		if (device_register(&mdev->dci->dev)) {
+			put_device(&mdev->dci->dev);
 			mutex_unlock(&mdev->io_mutex);
 			most_deregister_interface(&mdev->iface);
-			ret = -ENOMEM;
-			goto err_free_dci;
+			return -ENOMEM;
 		}
 		mdev->dci->usb_device = mdev->usb_device;
 	}
 	mutex_unlock(&mdev->io_mutex);
 	return 0;
-err_free_dci:
-	put_device(&mdev->dci->dev);
-err_free_busy_urbs:
-	kfree(mdev->busy_urbs);
 err_free_ep_address:
 	kfree(mdev->ep_address);
 err_free_cap:
Signature · 1 line
2.43.0
#5 lore raw

Re: [PATCH v2 2/2] most: usb: remove double cleanup of interface on registration failure

Quoted 5 lines · Navaneeth K

Since most_register_interface() now correctly handles cleanup (calling put_device on failure), the manual cleanup in hdm_probe() would cause a double-free.

Remove the manual cleanup labels and return the error code directly.

This exact change has already been done by Johan Hovold in the following
patch: https://lore.kernel.org/all/[email protected]/

I find that patch in Linux-next. It must have been already applied. and so you can drop this patch.

Regards,
Nihaal

#6 lore raw

Re: [PATCH v2 2/2] most: usb: remove double cleanup of interface on registration failure

Hi Nihaal,

Thanks for pointing that out. I missed that Johan's patch was already in linux-next.

I will drop this patch and send v3 containing only the core fix (which is still needed to prevent the leak).

Regards,
Navaneeth

Quoted 14 lines · Abdun Nihaal
Quoted 5 lines · Navaneeth K

Since most_register_interface() now correctly handles cleanup (calling put_device on failure), the manual cleanup in hdm_probe() would cause a double-free.

Remove the manual cleanup labels and return the error code directly.

This exact change has already been done by Johan Hovold in the following
patch: https://lore.kernel.org/all/[email protected]/

I find that patch in Linux-next. It must have been already applied. and so you can drop this patch.

Regards,
Nihaal