tpm: Fix the type of the return value in calc_tpm2_event_size()

Yue Haibing · James Morris · commit b9d0a85d6b2e · 2019-04-08T15:58:54.000-07:00
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: 4d23cc3 ("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>
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@`
`37`	`37`	`*`
`38`	`38`	`* Returns size of the event. If it is an invalid event, returns 0.`
`39`	`39`	`*/`
`40`		`-static int calc_tpm2_event_size(struct tcg_pcr_event2_head *event,`
`41`		`- struct tcg_pcr_event *event_header)`
	`40`	`+static size_t calc_tpm2_event_size(struct tcg_pcr_event2_head *event,`
	`41`	`+ struct tcg_pcr_event *event_header)`
`42`	`42`	`{`
`43`	`43`	`struct tcg_efi_specid_event_head *efispecid;`
`44`	`44`	`struct tcg_event_field *event_field;`