On Tue, Apr 23, 2019 at 03:58:16PM +0300, Jarkko Sakkinen wrote:

From: Yue Haibing yuehaibing@huawei.com

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

---

backport v5.0.8 fixed compilation issue 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 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; -- 2.20.1

This was a mistake. Please ignore. Sent another one.

/Jarkko