Patch "tpm: fix the cleanup of struct tpm_chip" has been added to the 4.5-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
tpm: fix the cleanup of struct tpm_chip
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tpm-fix-the-cleanup-of-struct-tpm_chip.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
8e0ee3c9faed7ca68807ea45141775856c438ac0Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <[email protected]>
Date: Mon, 8 Feb 2016 22:31:08 +0200
Subject: tpm: fix the cleanup of struct tpm_chip
From: Jarkko Sakkinen <[email protected]>
commit 8e0ee3c9faed7ca68807ea45141775856c438ac0 upstream.
If the initialization fails before tpm_chip_register(), put_device() will be not called, which causes release callback not to be called. This patch fixes the issue by adding put_device() to devres list of the parent device.
--- drivers/char/tpm/tpm-chip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/char/tpm/tpm-chip.c +3 -1
@@ -136,6 +136,8 @@ struct tpm_chip *tpmm_chip_alloc(struct chip->cdev.owner = chip->pdev->driver->owner; chip->cdev.kobj.parent = &chip->dev.kobj; +devm_add_action (dev, (void (*)(void *)) put_device, &chip->dev); +return chip; }EXPORT_SYMBOL_GPL (tpmm_chip_alloc);
@@ -171,7 +173,7 @@ static int tpm_add_char_device(struct tpstatic void tpm_del_char_device (struct tpm_chip *chip) {cdev_del (&chip->cdev); -device_unregister (&chip->dev); +device_del (&chip->dev); }static int tpm1_chip_register (struct tpm_chip *chip)
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/tpm_crb-tpm2_shutdown-must-be-called-before-tpm_chip_unregister.patch queue-4.5/tpm-fix-the-cleanup-of-struct-tpm_chip.patch queue-4.5/tpm-fix-the-rollback-in-tpm_chip_register.patch queue-4.5/tpm_eventlog.c-fix-binary_bios_measurements.patch