From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E708C282DA for ; Wed, 17 Apr 2019 17:00:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC8BA2173C for ; Wed, 17 Apr 2019 17:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555520443; bh=iCvOFIP2L1f1Iaan5LukhfYuxl1kjlIsF6gTxXh9zEc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=cToxJsZMjw1GvVRXgPbaJR9XyZpSw4gRNWv0v9cnx/74UT0zuN7MSR56jPe3noggn Ssh+sVEQD5RJ1wA2s7pb+xq1npauy15XS1BSgOmWYoYMU+Ll5lS+hbgWXWPtvW0F6/ LahdYT8ghrkT3G1n+q9Bs7/PulqNanD8XBg+qqLE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732321AbfDQRAn (ORCPT ); Wed, 17 Apr 2019 13:00:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:32854 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729512AbfDQRAn (ORCPT ); Wed, 17 Apr 2019 13:00:43 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 532FB20674; Wed, 17 Apr 2019 17:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555520442; bh=iCvOFIP2L1f1Iaan5LukhfYuxl1kjlIsF6gTxXh9zEc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=AcUhSukA8lI3yClK9p8f+Qz3/klfEHBDtQzzN53CoBBSCzbfyL0Fk2QoV0JuaNeKh HZfZyuNvzPBttDRLREX7abmJZJIk2Uz7ythSjRI+tb/kUXqEm0rxfbhMioINLufrxE 9AKJ4NpL8Nii+VZyCXuCfZ9espGuJDDigNyoVWp8= Date: Wed, 17 Apr 2019 13:00:41 -0400 From: Sasha Levin To: Jarkko Sakkinen Cc: stable@vger.kernel.org, Yue Haibing Subject: Re: [PATCH] tpm: Fix the type of the return value in calc_tpm2_event_size() Message-ID: <20190417170041.GE435@sasha-vm> References: <20190417152420.18170-1-jarkko.sakkinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190417152420.18170-1-jarkko.sakkinen@linux.intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Wed, Apr 17, 2019 at 06:24:20PM +0300, Jarkko Sakkinen wrote: >From: Yue Haibing > >commit 32312418625764cdf740890ac9c78ca26a6a9d24 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: >Fixes: 4d23cc323cdb ("tpm: add securityfs support for TPM 2.0 firmware event log") >Suggested-by: Jarkko Sakkinen >Signed-off-by: Yue Haibing >Reviewed-by: Jarkko Sakkinen >Signed-off-by: Jarkko Sakkinen >--- >backport v5.0.8 > 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 1b8fa9de2cac..130c3f227559 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_head *event, >+ struct tcg_pcr_event *event_header) > { > struct tcg_efi_specid_event *efispecid; > struct tcg_event_field *event_field; But it seems like it breaks the build: drivers/char/tpm/eventlog/tpm2.c:40:43: warning: ‘struct tcg_pcr_event2_head’ declared inside parameter list will not be visible outside of this definition or declaration static size_t calc_tpm2_event_size(struct tcg_pcr_event2_head *event, ^~~~~~~~~~~~~~~~~~~ drivers/char/tpm/eventlog/tpm2.c: In function ‘calc_tpm2_event_size’: drivers/char/tpm/eventlog/tpm2.c:55:32: error: dereferencing pointer to incomplete type ‘struct tcg_pcr_event2_head’ marker = marker + sizeof(event->pcr_idx) + sizeof(event->event_type) Probably because c8faabfc6f480 is missing. I've reverted this patch from stable for now. -- Thanks, Sasha