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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 DBF9DC10F0E for ; Mon, 15 Apr 2019 10:47:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE53E20684 for ; Mon, 15 Apr 2019 10:47:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555325238; bh=GhA7EZMY7IeaJA+fYd7I0cPsPDCXj5LeDxi/AIhOHqw=; h=Subject:To:Cc:From:Date:List-ID:From; b=1JUe4yXyErUmtNsX+ujE4zcGkYktVps3v82Wz78213jfVtXTt+5XXyKZUnGen32hf vc+Hthu5stohhKIXNWVpMFht44JbsdMtQt+rJyl/OCSh8JvMCBtVYKcW8xIwFwV2Jr h2nC4qFRzgcEyBPPDZr2hmj0bj/jVNEFgaMV0tkA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727330AbfDOKrN (ORCPT ); Mon, 15 Apr 2019 06:47:13 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:34959 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727305AbfDOKrL (ORCPT ); Mon, 15 Apr 2019 06:47:11 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id C81742618E; Mon, 15 Apr 2019 06:47:10 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 15 Apr 2019 06:47:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=gqJkTZ Ke0KomUPWBd2h+3vcu6RytimwNAvo1wpckSdI=; b=BOGqWE6ldZqHwDjPAhHCcD 6pKpF5aLCCajAthGkA+sbpzK4/0mE96RBsqKpBdnVJSfFa+dBCrxN3Vf4UoUV5qH CtcvxyVmTpUW2spD7lysRBmRnAcyk6f3/P2Atml5efFrP5nVX9E8PYXgbbGrme5A PDkB8U3h4g9ou4gtSQtL5VDStjmaIgOvtGFQpQsFvsEVOQYdcdPCexwFj6kk3G0P GL+9E2U+TIp4v15OhiW09FX1oQrHMmOeYG6V/DnNL6EFDh2P4LVVTurvXq4t39k7 g7Gv68yQOQpljqvRf0RlxJb4pL6QGsHD7Z9lIXoPbKcuovJO+21mJ0+wpmiOv/pw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrvdelgdefvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucfkphepkeefrdekiedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hgrhgvgheskhhrohgrhhdrtghomhenucevlhhushhtvghrufhiiigvpedu X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 3AB981030F; Mon, 15 Apr 2019 06:47:10 -0400 (EDT) Subject: FAILED: patch "[PATCH] tpm: Fix the type of the return value in" failed to apply to 4.14-stable tree To: yuehaibing@huawei.com, james.morris@microsoft.com, jarkko.sakkinen@linux.intel.com, stable@vger.kernel.org Cc: From: Date: Mon, 15 Apr 2019 12:47:01 +0200 Message-ID: <155532522119254@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b9d0a85d6b2e76630cfd4c475ee3af4109bfd87a Mon Sep 17 00:00:00 2001 From: Yue Haibing Date: Wed, 20 Feb 2019 16:25:38 +0800 Subject: [PATCH] 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: 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 Signed-off-by: James Morris 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;