From: Sasha Levin <sashal@kernel.org>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: stable@vger.kernel.org, Yue Haibing <yuehaibing@huawei.com>
Subject: Re: [PATCH] tpm: Fix the type of the return value in calc_tpm2_event_size()
Date: Wed, 17 Apr 2019 13:00:41 -0400 [thread overview]
Message-ID: <20190417170041.GE435@sasha-vm> (raw)
In-Reply-To: <20190417152420.18170-1-jarkko.sakkinen@linux.intel.com>
On Wed, Apr 17, 2019 at 06:24:20PM +0300, Jarkko Sakkinen wrote:
>From: Yue Haibing <yuehaibing@huawei.com>
>
>commit 32312418625764cdf740890ac9c78ca26a6a9d24 upstream
>
>calc_tpm2_event_size() has an invalid signature because
>it returns a 'size_t' where as its signature says that
>it returns 'int'.
>
>Cc: <stable@vger.kernel.org>
>Fixes: 4d23cc323cdb ("tpm: add securityfs support for TPM 2.0 firmware event log")
>Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
>Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
>Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
>Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
>---
>backport v5.0.8
> drivers/char/tpm/eventlog/tpm2.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/char/tpm/eventlog/tpm2.c b/drivers/char/tpm/eventlog/tpm2.c
>index 1b8fa9de2cac..130c3f227559 100644
>--- a/drivers/char/tpm/eventlog/tpm2.c
>+++ b/drivers/char/tpm/eventlog/tpm2.c
>@@ -37,8 +37,8 @@
> *
> * Returns size of the event. If it is an invalid event, returns 0.
> */
>-static int calc_tpm2_event_size(struct tcg_pcr_event2 *event,
>- struct tcg_pcr_event *event_header)
>+static size_t calc_tpm2_event_size(struct tcg_pcr_event2_head *event,
>+ struct tcg_pcr_event *event_header)
> {
> struct tcg_efi_specid_event *efispecid;
> struct tcg_event_field *event_field;
But it seems like it breaks the build:
drivers/char/tpm/eventlog/tpm2.c:40:43: warning: ‘struct tcg_pcr_event2_head’ declared inside parameter list will not be visible outside of this definition or declaration
static size_t calc_tpm2_event_size(struct tcg_pcr_event2_head *event,
^~~~~~~~~~~~~~~~~~~
drivers/char/tpm/eventlog/tpm2.c: In function ‘calc_tpm2_event_size’:
drivers/char/tpm/eventlog/tpm2.c:55:32: error: dereferencing pointer to incomplete type ‘struct tcg_pcr_event2_head’
marker = marker + sizeof(event->pcr_idx) + sizeof(event->event_type)
Probably because c8faabfc6f480 is missing. I've reverted this patch from
stable for now.
--
Thanks,
Sasha
next prev parent reply other threads:[~2019-04-17 17:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-17 15:24 [PATCH] tpm: Fix the type of the return value in calc_tpm2_event_size() Jarkko Sakkinen
2019-04-17 16:34 ` Sasha Levin
2019-04-23 11:42 ` Jarkko Sakkinen
2019-04-17 17:00 ` Sasha Levin [this message]
2019-04-23 11:45 ` 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=20190417170041.GE435@sasha-vm \
--to=sashal@kernel.org \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=yuehaibing@huawei.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).