diff options
| author | Yue Haibing <yuehaibing@huawei.com> | 2019-02-20 09:25:38 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-04-09 00:58:54 +0200 |
| commit | b9d0a85d6b2e76630cfd4c475ee3af4109bfd87a (patch) | |
| tree | a9e9a08023655de0e1bb7ab63537c3f8ccbd9bc2 /drivers/char | |
| parent | KEYS: trusted: allow trusted.ko to initialize w/o a TPM (diff) | |
| download | linux-b9d0a85d6b2e76630cfd4c475ee3af4109bfd87a.tar.xz linux-b9d0a85d6b2e76630cfd4c475ee3af4109bfd87a.zip | |
tpm: Fix the type of the return value in calc_tpm2_event_size()
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>
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 d8b77133a83a..f824563fc28d 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_head *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_head *efispecid; struct tcg_event_field *event_field; |