Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd78c943 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

drivers/char/tpm/tpm.c: fix error-path memory leak 

tpm_register_hardware() leaks devname on an error path.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11425



Reported-by: default avatarDaniel Marjamki <danielm77@spray.se>
Cc: Debora Velarde <debora@linux.vnet.ibm.com>
Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Cc: Marcel Selhorst <tpm@selhorst.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 63a10dfd

drivers/char/tpm/tpm.c

+8 −7
Original line number Diff line number Diff line
@@ -1187,11 +1187,8 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, 
	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 out_free;



	mutex_init(&chip->buffer_mutex);

	mutex_init(&chip->tpm_mutex);
@@ -1208,8 +1205,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, 


	if (chip->dev_num >= TPM_NUM_DEVICES) {

		dev_err(dev, "No available tpm device numbers\n");

		kfree(chip);

		return NULL;

		goto out_free;

	} else if (chip->dev_num == 0)

		chip->vendor.miscdev.minor = TPM_MINOR;

	else
@@ -1250,6 +1246,11 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, 
	spin_unlock(&driver_lock);



	return chip;



out_free:

	kfree(chip);

	kfree(devname);

	return NULL;

}

EXPORT_SYMBOL_GPL(tpm_register_hardware);