Re: [patch] usb: gadget: f_tcm: memory leak on error in tcm_alloc_inst()

[Felipe Balbi]

Dan Carpenter  writes:
> We need to kfree(opts) on error.  Also it's nicer to allocate opts
> before taking the lock.
>
> Signed-off-by: Dan Carpenter 

what's the base for this commit ? I don't have f_tcm.c anywhere.

-- 
balbi


signature.asc
Description: PGP signature

[patch] usb: gadget: f_tcm: memory leak on error in tcm_alloc_inst()

[Dan Carpenter]

We need to kfree(opts) on error.  Also it's nicer to allocate opts
before taking the lock.

Signed-off-by: Dan Carpenter 

diff --git a/drivers/usb/gadget/function/f_tcm.c 
b/drivers/usb/gadget/function/f_tcm.c
index ed47e40..0a26a2e 100644
--- a/drivers/usb/gadget/function/f_tcm.c
+++ b/drivers/usb/gadget/function/f_tcm.c
@@ -2300,20 +2300,19 @@ static struct usb_function_instance 
*tcm_alloc_inst(void)
struct f_tcm_opts *opts;
int i;
 
-   mutex_lock(_instances_lock);
-   opts = kzalloc(sizeof(*opts), GFP_KERNEL);
-   if (!opts) {
-   mutex_unlock(_instances_lock);
 
+   opts = kzalloc(sizeof(*opts), GFP_KERNEL);
+   if (!opts)
return ERR_PTR(-ENOMEM);
-   }
+
+   mutex_lock(_instances_lock);
for (i = 0; i < TPG_INSTANCES; ++i)
if (!tpg_instances[i].func_inst)
break;
 
if (i == TPG_INSTANCES) {
mutex_unlock(_instances_lock);
-
+   kfree(opts);
return ERR_PTR(-EBUSY);
}
tpg_instances[i].func_inst = >func_inst;
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html