Patch "tpm_crb: tpm2_shutdown() must be called before tpm_chip_unregister()" has been added to the 4.5-stable tree

Patch "tpm_crb: tpm2_shutdown() must be called before tpm_chip_unregister()" has been added to the 4.5-stable tree

[gregkh]

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

    tpm_crb: tpm2_shutdown() must be called before tpm_chip_unregister()

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_crb-tpm2_shutdown-must-be-called-before-tpm_chip_unregister.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 <stable@vger.kernel.org> know about it.


>From 99cda8cb4639de81cde785b5bab9bc52e916e594 Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Thu, 18 Feb 2016 22:11:29 +0200
Subject: tpm_crb: tpm2_shutdown() must be called before tpm_chip_unregister()

From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>

commit 99cda8cb4639de81cde785b5bab9bc52e916e594 upstream.

Wrong call order.

Reported-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Fixes: 74d6b3ceaa17
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/char/tpm/tpm_crb.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -302,11 +302,11 @@ static int crb_acpi_remove(struct acpi_d
 	struct device *dev = &device->dev;
 	struct tpm_chip *chip = dev_get_drvdata(dev);
 
-	tpm_chip_unregister(chip);
-
 	if (chip->flags & TPM_CHIP_FLAG_TPM2)
 		tpm2_shutdown(chip, TPM2_SU_CLEAR);
 
+	tpm_chip_unregister(chip);
+
 	return 0;
 }
 


Patches currently in stable-queue which might be from jarkko.sakkinen@linux.intel.com 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