FAILED: patch "[PATCH] usb: gadget: f_hid: fix device reference leak in hidg_alloc()" failed to apply to 5.10-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 4f88d65def6f3c90121601b4f62a4c967f3063a6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026060453-blazer-sublet-0c66@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 4f88d65def6f3c90121601b4f62a4c967f3063a6 Mon Sep 17 00:00:00 2001
From: Guangshuo Li <[email protected]>
Date: Mon, 13 Apr 2026 22:21:19 +0800
Subject: [PATCH] usb: gadget: f_hid: fix device reference leak in hidg_alloc()
hidg_alloc() initializes hidg->dev with device_initialize() before calling dev_set_name(). If dev_set_name() fails, the function currently jumps to err_unlock and returns without calling put_device().
This leaves the device reference unbalanced and prevents hidg_release() from being called. Calling put_device() here is also safe, since hidg_release() only frees resources owned by hidg.
The issue was identified by a static analysis tool I developed and confirmed by manual review.
Route the dev_set_name() failure path through err_put_device so the device reference is dropped properly.
drivers/usb/gadget/function/f_hid.c +1 -2
@@ -1622,7 +1622,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) hidg->dev.devt =MKDEV (major, opts->minor); ret =dev_set_name (&hidg->dev,"hidg%d" , opts->minor);if (ret) - goto err_unlock; + goto err_put_device; hidg->bInterfaceSubClass = opts->subclass; hidg->bInterfaceProtocol = opts->protocol;
@@ -1659,7 +1659,6 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) err_put_device:put_device (&hidg->dev); -err_unlock:mutex_unlock (&opts->lock);return ERR_PTR (ret); }
Sasha Levin
maintainerPATCH 1/2 usb: gadget: f_hid: tidy error handling in hidg_alloc
From: John Keeping <[email protected]>
[ Upstream commit 944fe915d00d3cb1bacb1e77cabfb6dc82e6f8b8 ]
Unify error handling at the end of the function, reducing the risk of missing something on one of the error paths.
Moving the increment of opts->refcnt later means there is no need to decrement it on the error path and is safe as this is guarded by opts->lock which is held for this entire section.
Stable-dep-of: 4f88d65def6f ("usb: gadget: f_hid: fix device reference leak in hidg_alloc()")
--- drivers/usb/gadget/function/f_hid.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/usb/gadget/function/f_hid.c +11 -10
@@ -1265,7 +1265,6 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) opts = container_of(fi, struct f_hid_opts, func_inst);mutex_lock (&opts->lock); - ++opts->refcnt;spin_lock_init (&hidg->write_spinlock);spin_lock_init (&hidg->read_spinlock);
@@ -1278,11 +1277,8 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) hidg->dev.class = hidg_class; hidg->dev.devt =MKDEV (major, opts->minor); ret =dev_set_name (&hidg->dev,"hidg%d" , opts->minor); -if (ret) { - --opts->refcnt; -mutex_unlock (&opts->lock); -return ERR_PTR (ret); - } +if (ret) + goto err_unlock; hidg->bInterfaceSubClass = opts->subclass; hidg->bInterfaceProtocol = opts->protocol;
@@ -1293,14 +1289,13 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) opts->report_desc_length, GFP_KERNEL);if (!hidg->report_desc) { -put_device (&hidg->dev); - --opts->refcnt; -mutex_unlock (&opts->lock); -return ERR_PTR (-ENOMEM ); + ret = -ENOMEM ; + goto err_put_device; } } hidg->use_out_ep = !opts->no_out_endpoint; + ++opts->refcnt;mutex_unlock (&opts->lock); hidg->func.name ="hid" ;
@@ -1315,6 +1310,12 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) hidg->qlen =4 ;return &hidg->func; + +err_put_device: +put_device (&hidg->dev); +err_unlock: +mutex_unlock (&opts->lock); +return ERR_PTR (ret); }DECLARE_USB_FUNCTION_INIT (hid, hidg_alloc_inst, hidg_alloc);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 usb: gadget: f_hid: fix device reference leak in hidg_alloc()
From: Guangshuo Li <[email protected]>
[ Upstream commit 4f88d65def6f3c90121601b4f62a4c967f3063a6 ]
hidg_alloc() initializes hidg->dev with device_initialize() before calling dev_set_name(). If dev_set_name() fails, the function currently jumps to err_unlock and returns without calling put_device().
This leaves the device reference unbalanced and prevents hidg_release() from being called. Calling put_device() here is also safe, since hidg_release() only frees resources owned by hidg.
The issue was identified by a static analysis tool I developed and confirmed by manual review.
Route the dev_set_name() failure path through err_put_device so the device reference is dropped properly.
--- drivers/usb/gadget/function/f_hid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/gadget/function/f_hid.c +1 -2
@@ -1278,7 +1278,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) hidg->dev.devt =MKDEV (major, opts->minor); ret =dev_set_name (&hidg->dev,"hidg%d" , opts->minor);if (ret) - goto err_unlock; + goto err_put_device; hidg->bInterfaceSubClass = opts->subclass; hidg->bInterfaceProtocol = opts->protocol;
@@ -1313,7 +1313,6 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) err_put_device:put_device (&hidg->dev); -err_unlock:mutex_unlock (&opts->lock);return ERR_PTR (ret); }
Signature · 1 line
2.53.0