tpm: release memory on init failure
PATCH 1/1 tpm: release memory on init failure
From: Randy Dunlap <[email protected]>
For kernel bugzilla #11425:
http://bugzilla.kernel.org/show_bug.cgi?id=11425
Release memory on init failure.
Signed-off-by Randy Dunlap <[email protected]>
Reported-by Daniel Marjamäki <[email protected]>
--- drivers/char/tpm/tpm.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/char/tpm/tpm.c +10 -9
@@ -1183,11 +1183,8 @@ struct tpm_chip *tpm_register_hardware(s chip =kzalloc (sizeof (*chip),GFP_KERNEL ); devname =kmalloc (DEVNAME_SIZE ,GFP_KERNEL ); -if (chip ==NULL || devname ==NULL ) { -kfree (chip); -kfree (devname); -return NULL ; - } +if (chip ==NULL || devname ==NULL ) + goto fail;mutex_init (&chip->buffer_mutex);mutex_init (&chip->tpm_mutex);
@@ -1204,8 +1201,7 @@ struct tpm_chip *tpm_register_hardware(sif (chip->dev_num >=TPM_NUM_DEVICES ) {dev_err (dev,"No available tpm device numbers\n" ); -kfree (chip); -return NULL ; + goto fail; }else if (chip->dev_num ==0 ) chip->vendor.miscdev.minor =TPM_MINOR ;else
@@ -1228,7 +1224,7 @@ struct tpm_chip *tpm_register_hardware(s chip->vendor.miscdev.name, chip->vendor.miscdev.minor);put_device (chip->dev); -return NULL ; + goto fail; }spin_lock (&driver_lock);
@@ -1241,12 +1237,17 @@ struct tpm_chip *tpm_register_hardware(slist_del (&chip->list);misc_deregister (&chip->vendor.miscdev);put_device (chip->dev); -return NULL ; + goto fail; } chip->bios_dir =tpm_bios_log_setup (devname);return chip; + +fail: +kfree (chip); +kfree (devname); +return NULL ; }EXPORT_SYMBOL_GPL (tpm_register_hardware);
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/
Quoted 4 lines · On Mon, 8 Sep 2008 10:45:30 -0700 Randy Dunlap <[email protected]> wrote:
For kernel bugzilla #11425:
http://bugzilla.kernel.org/show_bug.cgi?id=11425Release memory on init failure.
Seems I already fixed it:
http://userweb.kernel.org/~akpm/mmotm/broken-out/drivers-char-tpm-tpmc-fix-error-patch-memory-leak.patch
(identical to yours, with a different label name).