Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933370AbcDYR5e (ORCPT ); Mon, 25 Apr 2016 13:57:34 -0400 Received: from quartz.orcorp.ca ([184.70.90.242]:43088 "EHLO quartz.orcorp.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932931AbcDYR5b (ORCPT ); Mon, 25 Apr 2016 13:57:31 -0400 Date: Mon, 25 Apr 2016 11:57:20 -0600 From: Jason Gunthorpe To: Jarkko Sakkinen Cc: Peter Huewe , linux-security-module@vger.kernel.org, Stefan Berger , Marcel Selhorst , "moderated list:TPM DEVICE DRIVER" , open list Subject: Re: [PATCH] tpm: check for TPM_CHIP_FLAG_TPM2 before calling tpm2_shutdown() Message-ID: <20160425175720.GB7675@obsidianresearch.com> References: <1461576090-24813-1-git-send-email-jarkko.sakkinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1461576090-24813-1-git-send-email-jarkko.sakkinen@linux.intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Broken-Reverse-DNS: no host name found for IP address 10.0.0.160 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 884 Lines: 22 On Mon, Apr 25, 2016 at 12:21:30PM +0300, Jarkko Sakkinen wrote: > Signed-off-by: Jarkko Sakkinen > Reported-by: Stefan Berger > drivers/char/tpm/tpm-chip.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-By: Jason Gunthorpe Fixes: 20e0152393b41 ("tpm: fix crash in tpm_tis deinitialization") > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c > index a12db8e..1965dc7 100644 > +++ b/drivers/char/tpm/tpm-chip.c > @@ -270,7 +270,8 @@ static void tpm_del_char_device(struct tpm_chip *chip) > > /* Make the driver uncallable. */ > down_write(&chip->ops_sem); > - tpm2_shutdown(chip, TPM2_SU_CLEAR); > + if (chip->flags & TPM_CHIP_FLAG_TPM2) > + tpm2_shutdown(chip, TPM2_SU_CLEAR); > chip->ops = NULL; > up_write(&chip->ops_sem); > }