From: Vadim Sukhomlinov sukhomlinov@google.com
commit db4d8cb9c9f2af71c4d087817160d866ed572cc9 upstream
TPM 2.0 Shutdown involve sending TPM2_Shutdown to TPM chip and disabling future TPM operations. TPM 1.2 behavior was different, future TPM operations weren't disabled, causing rare issues. This patch ensures that future TPM operations are disabled.
Fixes: d1bd4a792d39 ("tpm: Issue a TPM2_Shutdown for TPM2 devices.") Cc: stable@vger.kernel.org Signed-off-by: Vadim Sukhomlinov sukhomlinov@google.com [dianders: resolved merge conflicts with mainline] Signed-off-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com --- drivers/char/tpm/tpm-chip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 0eca20c5a80c..dcf5bb153495 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -158,12 +158,13 @@ static int tpm_class_shutdown(struct device *dev) { struct tpm_chip *chip = container_of(dev, struct tpm_chip, dev);
+ down_write(&chip->ops_sem); if (chip->flags & TPM_CHIP_FLAG_TPM2) { - down_write(&chip->ops_sem); tpm2_shutdown(chip, TPM2_SU_CLEAR); chip->ops = NULL; - up_write(&chip->ops_sem); } + chip->ops = NULL; + up_write(&chip->ops_sem);
return 0; }
On Wed, Oct 02, 2019 at 04:14:44PM +0300, Jarkko Sakkinen wrote:
From: Vadim Sukhomlinov sukhomlinov@google.com
commit db4d8cb9c9f2af71c4d087817160d866ed572cc9 upstream
TPM 2.0 Shutdown involve sending TPM2_Shutdown to TPM chip and disabling future TPM operations. TPM 1.2 behavior was different, future TPM operations weren't disabled, causing rare issues. This patch ensures that future TPM operations are disabled.
Fixes: d1bd4a792d39 ("tpm: Issue a TPM2_Shutdown for TPM2 devices.") Cc: stable@vger.kernel.org Signed-off-by: Vadim Sukhomlinov sukhomlinov@google.com [dianders: resolved merge conflicts with mainline] Signed-off-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com
drivers/char/tpm/tpm-chip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
What kernel version(s) is this for?
thanks,
greg k-h
On Wed, Oct 02, 2019 at 03:57:58PM +0200, Greg KH wrote:
On Wed, Oct 02, 2019 at 04:14:44PM +0300, Jarkko Sakkinen wrote:
From: Vadim Sukhomlinov sukhomlinov@google.com
commit db4d8cb9c9f2af71c4d087817160d866ed572cc9 upstream
TPM 2.0 Shutdown involve sending TPM2_Shutdown to TPM chip and disabling future TPM operations. TPM 1.2 behavior was different, future TPM operations weren't disabled, causing rare issues. This patch ensures that future TPM operations are disabled.
Fixes: d1bd4a792d39 ("tpm: Issue a TPM2_Shutdown for TPM2 devices.") Cc: stable@vger.kernel.org Signed-off-by: Vadim Sukhomlinov sukhomlinov@google.com [dianders: resolved merge conflicts with mainline] Signed-off-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com
drivers/char/tpm/tpm-chip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
What kernel version(s) is this for?
It would go to 4.19, we've recently reverted an incorrect backport of this patch.
Jarkko, why is this patch 3/3? We haven't seen the first two on the mailing list, do we need anything besides this patch?
-- Thanks, Sasha
On Wed Oct 02 19, Sasha Levin wrote:
On Wed, Oct 02, 2019 at 03:57:58PM +0200, Greg KH wrote:
On Wed, Oct 02, 2019 at 04:14:44PM +0300, Jarkko Sakkinen wrote:
From: Vadim Sukhomlinov sukhomlinov@google.com
commit db4d8cb9c9f2af71c4d087817160d866ed572cc9 upstream
TPM 2.0 Shutdown involve sending TPM2_Shutdown to TPM chip and disabling future TPM operations. TPM 1.2 behavior was different, future TPM operations weren't disabled, causing rare issues. This patch ensures that future TPM operations are disabled.
Fixes: d1bd4a792d39 ("tpm: Issue a TPM2_Shutdown for TPM2 devices.") Cc: stable@vger.kernel.org Signed-off-by: Vadim Sukhomlinov sukhomlinov@google.com [dianders: resolved merge conflicts with mainline] Signed-off-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com
drivers/char/tpm/tpm-chip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
What kernel version(s) is this for?
It would go to 4.19, we've recently reverted an incorrect backport of this patch.
Jarkko, why is this patch 3/3? We haven't seen the first two on the mailing list, do we need anything besides this patch?
-- Thanks, Sasha
It looks like there was a problem mailing the earlier patchset, and patches 1 and 2 weren't cc'd to stable, but patch 3 was.
On Wed Oct 02 19, Jerry Snitselaar wrote:
On Wed Oct 02 19, Sasha Levin wrote:
On Wed, Oct 02, 2019 at 03:57:58PM +0200, Greg KH wrote:
On Wed, Oct 02, 2019 at 04:14:44PM +0300, Jarkko Sakkinen wrote:
From: Vadim Sukhomlinov sukhomlinov@google.com
commit db4d8cb9c9f2af71c4d087817160d866ed572cc9 upstream
TPM 2.0 Shutdown involve sending TPM2_Shutdown to TPM chip and disabling future TPM operations. TPM 1.2 behavior was different, future TPM operations weren't disabled, causing rare issues. This patch ensures that future TPM operations are disabled.
Fixes: d1bd4a792d39 ("tpm: Issue a TPM2_Shutdown for TPM2 devices.") Cc: stable@vger.kernel.org Signed-off-by: Vadim Sukhomlinov sukhomlinov@google.com [dianders: resolved merge conflicts with mainline] Signed-off-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com
drivers/char/tpm/tpm-chip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
What kernel version(s) is this for?
It would go to 4.19, we've recently reverted an incorrect backport of this patch.
Jarkko, why is this patch 3/3? We haven't seen the first two on the mailing list, do we need anything besides this patch?
-- Thanks, Sasha
It looks like there was a problem mailing the earlier patchset, and patches 1 and 2 weren't cc'd to stable, but patch 3 was.
Is linux-stabley@vger.kernel.org a valid address?
On Wed, Oct 02, 2019 at 08:42:04AM -0700, Jerry Snitselaar wrote:
On Wed Oct 02 19, Jerry Snitselaar wrote:
On Wed Oct 02 19, Sasha Levin wrote:
On Wed, Oct 02, 2019 at 03:57:58PM +0200, Greg KH wrote:
On Wed, Oct 02, 2019 at 04:14:44PM +0300, Jarkko Sakkinen wrote:
From: Vadim Sukhomlinov sukhomlinov@google.com
commit db4d8cb9c9f2af71c4d087817160d866ed572cc9 upstream
TPM 2.0 Shutdown involve sending TPM2_Shutdown to TPM chip and disabling future TPM operations. TPM 1.2 behavior was different, future TPM operations weren't disabled, causing rare issues. This patch ensures that future TPM operations are disabled.
Fixes: d1bd4a792d39 ("tpm: Issue a TPM2_Shutdown for TPM2 devices.") Cc: stable@vger.kernel.org Signed-off-by: Vadim Sukhomlinov sukhomlinov@google.com [dianders: resolved merge conflicts with mainline] Signed-off-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com
drivers/char/tpm/tpm-chip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
What kernel version(s) is this for?
It would go to 4.19, we've recently reverted an incorrect backport of this patch.
Jarkko, why is this patch 3/3? We haven't seen the first two on the mailing list, do we need anything besides this patch?
-- Thanks, Sasha
It looks like there was a problem mailing the earlier patchset, and patches 1 and 2 weren't cc'd to stable, but patch 3 was.
Is linux-stabley@vger.kernel.org a valid address?
Heh, no :)
On Wed, Oct 02, 2019 at 08:42:04AM -0700, Jerry Snitselaar wrote:
On Wed Oct 02 19, Jerry Snitselaar wrote:
On Wed Oct 02 19, Sasha Levin wrote:
On Wed, Oct 02, 2019 at 03:57:58PM +0200, Greg KH wrote:
On Wed, Oct 02, 2019 at 04:14:44PM +0300, Jarkko Sakkinen wrote:
From: Vadim Sukhomlinov sukhomlinov@google.com
commit db4d8cb9c9f2af71c4d087817160d866ed572cc9 upstream
TPM 2.0 Shutdown involve sending TPM2_Shutdown to TPM chip and disabling future TPM operations. TPM 1.2 behavior was different, future TPM operations weren't disabled, causing rare issues. This patch ensures that future TPM operations are disabled.
Fixes: d1bd4a792d39 ("tpm: Issue a TPM2_Shutdown for TPM2 devices.") Cc: stable@vger.kernel.org Signed-off-by: Vadim Sukhomlinov sukhomlinov@google.com [dianders: resolved merge conflicts with mainline] Signed-off-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com
drivers/char/tpm/tpm-chip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
What kernel version(s) is this for?
It would go to 4.19, we've recently reverted an incorrect backport of this patch.
Jarkko, why is this patch 3/3? We haven't seen the first two on the mailing list, do we need anything besides this patch?
-- Thanks, Sasha
It looks like there was a problem mailing the earlier patchset, and patches 1 and 2 weren't cc'd to stable, but patch 3 was.
Is linux-stabley@vger.kernel.org a valid address?
No, did a resend :-(
/Jarkko
On Thu, Oct 03, 2019 at 02:24:42PM +0300, Jarkko Sakkinen wrote:
On Wed, Oct 02, 2019 at 08:42:04AM -0700, Jerry Snitselaar wrote:
On Wed Oct 02 19, Jerry Snitselaar wrote:
On Wed Oct 02 19, Sasha Levin wrote:
On Wed, Oct 02, 2019 at 03:57:58PM +0200, Greg KH wrote:
On Wed, Oct 02, 2019 at 04:14:44PM +0300, Jarkko Sakkinen wrote:
From: Vadim Sukhomlinov sukhomlinov@google.com
commit db4d8cb9c9f2af71c4d087817160d866ed572cc9 upstream
TPM 2.0 Shutdown involve sending TPM2_Shutdown to TPM chip and disabling future TPM operations. TPM 1.2 behavior was different, future TPM operations weren't disabled, causing rare issues. This patch ensures that future TPM operations are disabled.
Fixes: d1bd4a792d39 ("tpm: Issue a TPM2_Shutdown for TPM2 devices.") Cc: stable@vger.kernel.org Signed-off-by: Vadim Sukhomlinov sukhomlinov@google.com [dianders: resolved merge conflicts with mainline] Signed-off-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com Signed-off-by: Jarkko Sakkinen jarkko.sakkinen@linux.intel.com
drivers/char/tpm/tpm-chip.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
What kernel version(s) is this for?
It would go to 4.19, we've recently reverted an incorrect backport of this patch.
Jarkko, why is this patch 3/3? We haven't seen the first two on the mailing list, do we need anything besides this patch?
-- Thanks, Sasha
It looks like there was a problem mailing the earlier patchset, and patches 1 and 2 weren't cc'd to stable, but patch 3 was.
Is linux-stabley@vger.kernel.org a valid address?
No, did a resend :-(
New version sent to stableish@vger.kernel.org.
/Jarkko
linux-stable-mirror@lists.linaro.org
-
Greg KH -
Jarkko Sakkinen -
Jerry Snitselaar -
Sasha Levin