| From 4afa0c22eed33cfe0c590742387f0d16f32412f3 Mon Sep 17 00:00:00 2001 |
| From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> |
| Date: Tue, 13 Jul 2021 12:34:38 +0300 |
| Subject: driver core: auxiliary bus: Fix memory leak when driver_register() fail |
| |
| From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> |
| |
| commit 4afa0c22eed33cfe0c590742387f0d16f32412f3 upstream. |
| |
| If driver_register() returns with error we need to free the memory |
| allocated for auxdrv->driver.name before returning from |
| __auxiliary_driver_register() |
| |
| Fixes: 7de3697e9cbd4 ("Add auxiliary bus support") |
| Reviewed-by: Dan Williams <dan.j.williams@intel.com> |
| Cc: stable <stable@vger.kernel.org> |
| Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> |
| Link: https://lore.kernel.org/r/20210713093438.3173-1-peter.ujfalusi@linux.intel.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/base/auxiliary.c | 8 +++++++- |
| 1 file changed, 7 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/base/auxiliary.c |
| +++ b/drivers/base/auxiliary.c |
| @@ -231,6 +231,8 @@ EXPORT_SYMBOL_GPL(auxiliary_find_device) |
| int __auxiliary_driver_register(struct auxiliary_driver *auxdrv, |
| struct module *owner, const char *modname) |
| { |
| + int ret; |
| + |
| if (WARN_ON(!auxdrv->probe) || WARN_ON(!auxdrv->id_table)) |
| return -EINVAL; |
| |
| @@ -246,7 +248,11 @@ int __auxiliary_driver_register(struct a |
| auxdrv->driver.bus = &auxiliary_bus_type; |
| auxdrv->driver.mod_name = modname; |
| |
| - return driver_register(&auxdrv->driver); |
| + ret = driver_register(&auxdrv->driver); |
| + if (ret) |
| + kfree(auxdrv->driver.name); |
| + |
| + return ret; |
| } |
| EXPORT_SYMBOL_GPL(__auxiliary_driver_register); |
| |