TPM: fix memleak when register hardware fails
authorWanlong Gao <gaowanlong@cn.fujitsu.com>
Wed, 16 May 2012 08:24:28 +0000 (16:24 +0800)
committerRajiv Andrade <srajiv@linux.vnet.ibm.com>
Tue, 12 Jun 2012 21:53:50 +0000 (18:53 -0300)
Adding proper kfree() before returning.

Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
drivers/char/tpm/tpm.c

index 08427ab..dae254d 100644 (file)
@@ -1413,15 +1413,12 @@ struct tpm_chip *tpm_register_hardware(struct device *dev,
                        "unable to misc_register %s, minor %d\n",
                        chip->vendor.miscdev.name,
                        chip->vendor.miscdev.minor);
-               put_device(chip->dev);
-               return NULL;
+               goto put_device;
        }
 
        if (sysfs_create_group(&dev->kobj, chip->vendor.attr_group)) {
                misc_deregister(&chip->vendor.miscdev);
-               put_device(chip->dev);
-
-               return NULL;
+               goto put_device;
        }
 
        chip->bios_dir = tpm_bios_log_setup(devname);
@@ -1433,6 +1430,8 @@ struct tpm_chip *tpm_register_hardware(struct device *dev,
 
        return chip;
 
+put_device:
+       put_device(chip->dev);
 out_free:
        kfree(chip);
        kfree(devname);