From: Stefan Berger <stefanb@linux.ibm.com>
To: Nayna Jain <nayna@linux.ibm.com>,
linux-integrity@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Sachin Sant <sachinp@linux.vnet.ibm.com>,
George Wilson <gcwilson@linux.ibm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Michal Suchanek <msuchanek@suse.de>,
Peter Huewe <peterhuewe@gmx.de>, Mimi Zohar <zohar@linux.ibm.com>
Subject: Re: [PATCH v2] tpm: tpm_ibm_vtpm: Fix unallocated banks
Date: Sun, 7 Jul 2019 20:25:55 -0400 [thread overview]
Message-ID: <510c30d0-34f4-1937-7882-1880eb9241ed@linux.ibm.com> (raw)
In-Reply-To: <1562458725-15999-1-git-send-email-nayna@linux.ibm.com>
On 7/6/19 8:18 PM, Nayna Jain wrote:
> The nr_allocated_banks and allocated banks are initialized as part of
> tpm_chip_register. Currently, this is done as part of auto startup
> function. However, some drivers, like the ibm vtpm driver, do not run
> auto startup during initialization. This results in uninitialized memory
> issue and causes a kernel panic during boot.
>
> This patch moves the pcr allocation outside the auto startup function
> into tpm_chip_register. This ensures that allocated banks are initialized
> in any case.
>
> Fixes: 879b589210a9 ("tpm: retrieve digest size of unknown algorithms with
> PCR read")
> Reported-by: Michal Suchanek <msuchanek@suse.de>
> Signed-off-by: Nayna Jain <nayna@linux.ibm.com>
> Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
> Tested-by: Sachin Sant <sachinp@linux.vnet.ibm.com>
> Tested-by: Michal Suchánek <msuchanek@suse.de>
> ---
> Changelog:
>
> v2:
> * Includes Jarkko's feedbacks
> * fixes the function name to tpm_get_pcr_allocation()
> * adds new function tpm1_get_pcr_allocation()
> * updates patch summary line
> * fixes alignment
> * adds Reported-by: Michal Suchanek <msuchanek@suse.de>
> * Includes Stefan's feedbacks
> * Fixes overwriting of return code
> * Fixes misplacing of tpm_chip_stop()
> * Adds Reviewed-by, Tested-by
>
> drivers/char/tpm/tpm-chip.c | 22 ++++++++++++++++++++++
> drivers/char/tpm/tpm.h | 2 ++
> drivers/char/tpm/tpm1-cmd.c | 36 ++++++++++++++++++++++++------------
> drivers/char/tpm/tpm2-cmd.c | 6 +-----
> 4 files changed, 49 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> index 8804c9e916fd..6589291df355 100644
> --- a/drivers/char/tpm/tpm-chip.c
> +++ b/drivers/char/tpm/tpm-chip.c
> @@ -550,6 +550,22 @@ static int tpm_add_hwrng(struct tpm_chip *chip)
> return hwrng_register(&chip->hwrng);
> }
>
> +/*
> + * tpm_get_pcr_allocation() - initialize the chip allocated banks for PCRs
> + * @chip: TPM chip to use.
> + */
> +static int tpm_get_pcr_allocation(struct tpm_chip *chip)
> +{
> + int rc;
> +
> + if (chip->flags & TPM_CHIP_FLAG_TPM2)
> + rc = tpm2_get_pcr_allocation(chip);
For tpm2 case you need:
if (rc > 0)
rc = -ENODEV;
Because tpm2_get_pcr_allocation(chip) returns ssize_t with return values
from tpm_transmit_cmd > 0 indicating a TPM 2 error code...
Stefan
next prev parent reply other threads:[~2019-07-08 0:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-07 0:18 Nayna Jain
2019-07-08 0:25 ` Stefan Berger [this message]
2019-07-08 15:11 ` Jarkko Sakkinen
2019-07-08 22:24 ` Mimi Zohar
2019-07-08 22:43 ` Christoph Hellwig
2019-07-09 16:38 ` Jarkko Sakkinen
2019-07-11 17:59 ` Nayna
2019-07-08 22:53 ` Jason Gunthorpe
2019-07-09 16:35 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=510c30d0-34f4-1937-7882-1880eb9241ed@linux.ibm.com \
--to=stefanb@linux.ibm.com \
--cc=gcwilson@linux.ibm.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgg@ziepe.ca \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=msuchanek@suse.de \
--cc=nayna@linux.ibm.com \
--cc=peterhuewe@gmx.de \
--cc=sachinp@linux.vnet.ibm.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®