diff options
| author | Yue Haibing <yuehaibing@huawei.com> | 2019-04-23 16:05:18 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-27 09:36:40 +0200 |
| commit | 1c36862e8be8e45094024e7384a7b441779f34cb (patch) | |
| tree | 6d1cda080914d5264f7ae185058558cb84bb5532 /drivers/char | |
| parent | 18af9b7b91380825ac398ff3b94fac4e0621c5cc (diff) | |
| download | linux-stable-1c36862e8be8e45094024e7384a7b441779f34cb.tar.gz linux-stable-1c36862e8be8e45094024e7384a7b441779f34cb.tar.bz2 linux-stable-1c36862e8be8e45094024e7384a7b441779f34cb.zip | |
tpm: Fix the type of the return value in calc_tpm2_event_size()
commit b9d0a85d6b2e76630cfd4c475ee3af4109bfd87a 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>
Signed-off-by: James Morris <james.morris@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/eventlog/tpm2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tpm/eventlog/tpm2.c b/drivers/char/tpm/eventlog/tpm2.c index 1b8fa9de2cac..41b9f6c92da7 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 *event, + struct tcg_pcr_event *event_header) { struct tcg_efi_specid_event *efispecid; struct tcg_event_field *event_field; |