From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Roberto Sassu <roberto.sassu@huawei.com>
Cc: zohar@linux.ibm.com, linux-integrity@vger.kernel.org,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, silviu.vlasceanu@huawei.com
Subject: Re: [PATCH v4 1/6] tpm: dynamically allocate active_banks array
Date: Tue, 13 Nov 2018 19:04:43 +0200 [thread overview]
Message-ID: <20181113170443.GD4752@linux.intel.com> (raw)
In-Reply-To: <38bdee38-503b-0bac-efba-99f285018934@huawei.com>
On Tue, Nov 13, 2018 at 02:34:39PM +0100, Roberto Sassu wrote:
> On 11/8/2018 2:46 PM, Jarkko Sakkinen wrote:
> > Orrayn Tue, Nov 06, 2018 at 04:01:54PM +0100, Roberto Sassu wrote:
> > > This patch removes the hard-coded limit of the active_banks array size.
> > > It stores in the tpm_chip structure the number of active PCR banks,
> > > determined in tpm2_get_pcr_allocation(), and replaces the static array
> > > with a pointer to a dynamically allocated array.
> > >
> > > As a consequence of the introduction of nr_active_banks, tpm_pcr_extend()
> > > does not check anymore if the algorithm stored in tpm_chip is equal to
> > > zero. The active_banks array always contains valid algorithms.
> > >
> > > Fixes: 1db15344f874 ("tpm: implement TPM 2.0 capability to get active
> > > PCR banks")
> > >
> > > Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
> > > ---
> > > drivers/char/tpm/tpm-chip.c | 1 +
> > > drivers/char/tpm/tpm-interface.c | 19 ++++++++++++-------
> > > drivers/char/tpm/tpm.h | 3 ++-
> > > drivers/char/tpm/tpm2-cmd.c | 17 ++++++++---------
> > > 4 files changed, 23 insertions(+), 17 deletions(-)
> > >
> > > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
> > > index 46caadca916a..2a9e8b744436 100644
> > > --- a/drivers/char/tpm/tpm-chip.c
> > > +++ b/drivers/char/tpm/tpm-chip.c
> > > @@ -160,6 +160,7 @@ static void tpm_dev_release(struct device *dev)
> > > kfree(chip->log.bios_event_log);
> > > kfree(chip->work_space.context_buf);
> > > kfree(chip->work_space.session_buf);
> > > + kfree(chip->active_banks);
> > > kfree(chip);
> > > }
> > > diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
> > > index 1a803b0cf980..ba7ca6b3e664 100644
> > > --- a/drivers/char/tpm/tpm-interface.c
> > > +++ b/drivers/char/tpm/tpm-interface.c
> > > @@ -1039,8 +1039,7 @@ static int tpm1_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash,
> > > int tpm_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash)
> > > {
> > > int rc;
> > > - struct tpm2_digest digest_list[ARRAY_SIZE(chip->active_banks)];
> > > - u32 count = 0;
> > > + struct tpm2_digest *digest_list;
> > > int i;
> > > chip = tpm_find_get_ops(chip);
> > > @@ -1048,16 +1047,22 @@ int tpm_pcr_extend(struct tpm_chip *chip, int pcr_idx, const u8 *hash)
> > > return -ENODEV;
> >
> > Should take digest_list as input. Probably callers could re-use the
> > same digest_list array multiple times?
> >
> > Move struct tpm_chip to include/linux/tpm.h so that the caller can query
> > nr_active_banks and active_banks and can create the digest array by
> > itself. Lets do this right at once now that this is being restructured.
>
> I have to move also other structures and #define. Wouldn't be better to
> introduce a new function to pass to the caller active_banks and
> nr_active_banks?
Revisited. I think it is fine how it is for now and we reconsider
later. Only thing I want to remark is that use should use kcalloc()
instead of kalloc_array() + memset().
/Jarkko
next prev parent reply other threads:[~2018-11-13 17:04 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 15:01 [PATCH v4 0/6] tpm: retrieve digest size of unknown algorithms from TPM Roberto Sassu
2018-11-06 15:01 ` [PATCH v4 1/6] tpm: dynamically allocate active_banks array Roberto Sassu
2018-11-07 6:14 ` Nayna Jain
2018-11-07 9:41 ` Roberto Sassu
2018-11-08 13:50 ` Nayna Jain
2018-11-08 14:40 ` Roberto Sassu
2018-11-08 15:21 ` Jarkko Sakkinen
2018-11-08 15:29 ` Mimi Zohar
2018-11-08 18:57 ` Jarkko Sakkinen
2018-11-07 11:10 ` Mimi Zohar
2018-11-08 13:46 ` Jarkko Sakkinen
2018-11-08 14:24 ` Roberto Sassu
2018-11-08 15:22 ` Jarkko Sakkinen
2018-11-13 13:34 ` Roberto Sassu
2018-11-13 17:04 ` Jarkko Sakkinen [this message]
2018-11-13 13:53 ` Roberto Sassu
2018-11-06 15:01 ` [PATCH v4 2/6] tpm: remove definition of TPM2_ACTIVE_PCR_BANKS Roberto Sassu
2018-11-08 14:02 ` Jarkko Sakkinen
2018-11-08 14:03 ` Jarkko Sakkinen
2018-11-08 14:52 ` Roberto Sassu
2018-11-08 19:05 ` Jarkko Sakkinen
2018-11-06 15:01 ` [PATCH v4 3/6] tpm: rename and export tpm2_digest and tpm2_algorithms Roberto Sassu
2018-11-06 15:01 ` [PATCH v4 4/6] tpm: modify tpm_pcr_read() definition to pass a TPM hash algorithm Roberto Sassu
2018-11-08 14:04 ` Jarkko Sakkinen
2018-11-08 14:16 ` Roberto Sassu
2018-11-08 15:15 ` Jarkko Sakkinen
2018-11-08 15:19 ` Peter Huewe
2018-11-08 19:08 ` Jarkko Sakkinen
2018-11-13 12:34 ` Jarkko Sakkinen
2018-11-13 12:39 ` Roberto Sassu
2018-11-13 16:56 ` Jarkko Sakkinen
2018-11-06 15:01 ` [PATCH v4 5/6] tpm: retrieve digest size of unknown algorithms with PCR read Roberto Sassu
2018-11-06 15:01 ` [PATCH v4 6/6] tpm: ensure that the output of PCR read contains the correct digest size Roberto Sassu
2018-11-08 14:08 ` Jarkko Sakkinen
2018-11-08 14:47 ` Roberto Sassu
2018-11-08 18:52 ` Jarkko Sakkinen
2018-11-13 13:08 ` Roberto Sassu
2018-11-13 16:59 ` Jarkko Sakkinen
2018-11-08 13:51 ` [PATCH v4 0/6] tpm: retrieve digest size of unknown algorithms from TPM 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=20181113170443.GD4752@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=roberto.sassu@huawei.com \
--cc=silviu.vlasceanu@huawei.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;
as well as URLs for NNTP newsgroup(s).