Sfoglia il codice sorgente

TPM: fix memleak when register hardware fails

Adding proper kfree() before returning.

Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Wanlong Gao 13 anni fa
parent
commit
dad79cb892
1 ha cambiato i file con 4 aggiunte e 5 eliminazioni
  1. 4 5
      drivers/char/tpm/tpm.c

+ 4 - 5
drivers/char/tpm/tpm.c

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