Skip to contentSkip to conversation

Patch "tpm: fix the rollback in tpm_chip_register()" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message Apr 10, 2016

Subsystems (2)
Stable branch TPM device driver
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

tpm: fix the rollback in tpm_chip_register()

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-rollback-in-tpm_chip_register.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 72c91ce8523ae5828fe5e4417ae0aaab53707a08 Mon Sep 17 00:00:00 2001

From: Jarkko Sakkinen <[email protected]>
Date: Fri, 29 Jan 2016 09:47:22 -0800
Subject: tpm: fix the rollback in tpm_chip_register()

From: Jarkko Sakkinen <[email protected]>

commit 72c91ce8523ae5828fe5e4417ae0aaab53707a08 upstream.

Fixed the rollback and gave more self-documenting names for the functions.

Fixes d972b0523f ("tpm: fix call order in tpm-chip.c")
Signed-off-by Jarkko Sakkinen <[email protected]>
Reviewed-by Jason Gunthorpe <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/char/tpm/tpm-chip.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/char/tpm/tpm-chip.c +5 -5
@@ -140,7 +140,7 @@ struct tpm_chip *tpmm_chip_alloc(struct
 }
 EXPORT_SYMBOL_GPL(tpmm_chip_alloc);
 
-static int tpm_dev_add_device(struct tpm_chip *chip)
+static int tpm_add_char_device(struct tpm_chip *chip)
 {
 	int rc;
 

@@ -151,7 +151,6 @@ static int tpm_dev_add_device(struct tpm
 			chip->devname, MAJOR(chip->dev.devt),
 			MINOR(chip->dev.devt), rc);
 
-		device_unregister(&chip->dev);
 		return rc;
 	}
 

@@ -162,13 +161,14 @@ static int tpm_dev_add_device(struct tpm
 			chip->devname, MAJOR(chip->dev.devt),
 			MINOR(chip->dev.devt), rc);
 
+		cdev_del(&chip->cdev);
 		return rc;
 	}
 
 	return rc;
 }
 
-static void tpm_dev_del_device(struct tpm_chip *chip)
+static void tpm_del_char_device(struct tpm_chip *chip)
 {
 	cdev_del(&chip->cdev);
 	device_unregister(&chip->dev);

@@ -222,7 +222,7 @@ int tpm_chip_register(struct tpm_chip *c
 
 	tpm_add_ppi(chip);
 
-	rc = tpm_dev_add_device(chip);
+	rc = tpm_add_char_device(chip);
 	if (rc)
 		goto out_err;
 

@@ -274,6 +274,6 @@ void tpm_chip_unregister(struct tpm_chip
 		sysfs_remove_link(&chip->pdev->kobj, "ppi");
 
 	tpm1_chip_unregister(chip);
-	tpm_dev_del_device(chip);
+	tpm_del_char_device(chip);
 }
 EXPORT_SYMBOL_GPL(tpm_chip_unregister);

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