public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] driver core: auxiliary bus: Fix memory leak when driver_register() fail
@ 2021-07-13  9:34 Peter Ujfalusi
  2021-07-13 18:17 ` Dan Williams
  0 siblings, 1 reply; 2+ messages in thread
From: Peter Ujfalusi @ 2021-07-13  9:34 UTC (permalink / raw)
  To: gregkh, rafael, david.m.ertman
  Cc: dan.j.williams, ranjani.sridharan, linux-kernel, peter.ujfalusi

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")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
 drivers/base/auxiliary.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
index adc199dfba3c..6a30264ab2ba 100644
--- 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 auxiliary_driver *auxdrv,
 	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);
 
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] driver core: auxiliary bus: Fix memory leak when driver_register() fail
  2021-07-13  9:34 [PATCH] driver core: auxiliary bus: Fix memory leak when driver_register() fail Peter Ujfalusi
@ 2021-07-13 18:17 ` Dan Williams
  0 siblings, 0 replies; 2+ messages in thread
From: Dan Williams @ 2021-07-13 18:17 UTC (permalink / raw)
  To: Peter Ujfalusi
  Cc: Greg KH, Rafael J. Wysocki, David M Ertman, Ranjani Sridharan,
	Linux Kernel Mailing List

On Tue, Jul 13, 2021 at 2:34 AM Peter Ujfalusi
<peter.ujfalusi@linux.intel.com> wrote:
>
> 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")
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

Good catch,

Reviewed-by: Dan Williams <dan.j.williams@intel.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-07-13 18:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-13  9:34 [PATCH] driver core: auxiliary bus: Fix memory leak when driver_register() fail Peter Ujfalusi
2021-07-13 18:17 ` Dan Williams

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox