]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tpm: Fix the type of the return value in calc_tpm2_event_size()
authorYue Haibing <yuehaibing@huawei.com>
Tue, 23 Apr 2019 13:05:18 +0000 (16:05 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Apr 2019 07:36:40 +0000 (09:36 +0200)
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>
drivers/char/tpm/eventlog/tpm2.c

index 1b8fa9de2cacedbbc2a290f4f75ccc75fd4c270d..41b9f6c92da73114379f2dda56b34a7c1ac89058 100644 (file)
@@ -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;