Skip to content

Commit 4afa0c2

Browse files
ujfalusigregkh
authored andcommitted
driver core: auxiliary bus: Fix memory leak when driver_register() fail
If driver_register() returns with error we need to free the memory allocated for auxdrv->driver.name before returning from __auxiliary_driver_register() Fixes: 7de3697 ("Add auxiliary bus support") Reviewed-by: Dan Williams <[email protected]> Cc: stable <[email protected]> Signed-off-by: Peter Ujfalusi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2734d6c commit 4afa0c2

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/base/auxiliary.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@ EXPORT_SYMBOL_GPL(auxiliary_find_device);
231231
int __auxiliary_driver_register(struct auxiliary_driver *auxdrv,
232232
struct module *owner, const char *modname)
233233
{
234+
int ret;
235+
234236
if (WARN_ON(!auxdrv->probe) || WARN_ON(!auxdrv->id_table))
235237
return -EINVAL;
236238

@@ -246,7 +248,11 @@ int __auxiliary_driver_register(struct auxiliary_driver *auxdrv,
246248
auxdrv->driver.bus = &auxiliary_bus_type;
247249
auxdrv->driver.mod_name = modname;
248250

249-
return driver_register(&auxdrv->driver);
251+
ret = driver_register(&auxdrv->driver);
252+
if (ret)
253+
kfree(auxdrv->driver.name);
254+
255+
return ret;
250256
}
251257
EXPORT_SYMBOL_GPL(__auxiliary_driver_register);
252258

0 commit comments

Comments
 (0)