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 7C689C282DA for ; Mon, 15 Apr 2019 10:47:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50BE92087C for ; Mon, 15 Apr 2019 10:47:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555325226; bh=ziT0wAzlHroV2bAoQId7V6Xn/h38ohZ1ttcOErT6llI=; h=Subject:To:Cc:From:Date:List-ID:From; b=btKNtstEAKS2c/5OPyw8cHImfZoQdu595uOK3UsIzKmx4OM+Aw7xTOsmbDnh3TfjL oleUSYfmRMoOet8coFzi5LNF39r6fFZfTdq+YUjN/ZyEtoQFlJhtqi1zwZ+ZcNpC5Y knPD2IEzEwqhYXS0kSD3dywGN2AA4NOQ9hwgoTeY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727286AbfDOKrE (ORCPT ); Mon, 15 Apr 2019 06:47:04 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:41231 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727282AbfDOKrE (ORCPT ); Mon, 15 Apr 2019 06:47:04 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 6136E2613D; Mon, 15 Apr 2019 06:47:03 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 15 Apr 2019 06:47:03 -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=chXSz1 PTEihcstqp63mJ++UepqI+QiyfoCVrOyHELiQ=; b=QACivLH3L+eFRtSSR3EAUp /9Oww8/5WzFBIw3q32B1M/OLRab180OGgxJFbNYdshhorBWWiRAdiuXF9tn4PIFd nefV8C40ILndPvF0KDHRWdeHtYa1DIQZsgtzliCdubnm/7NmqMvNWZu6PHYPM7t9 RKQaXbNV0QrcizL4HzA87dxcJ8h2x2a4KHU3wnLVMTU/MMPnc1Bdj/888eQ5ecp7 PFIEuRFbeDkqMdxaZ/ntU/oCXSCShvsnR3x9KowPxjEHw8lzNJbTL0QmmywutIsO 7drFLy6mtg1T37Zk7YUQO6I40l9T52cdcpCkqlSMDsnGjZec+F94D5KK9xXnlUIw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrvdelgdefvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucfkphepkeefrdekiedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hgrhgvgheskhhrohgrhhdrtghomhenucevlhhushhtvghrufhiiigvpedt 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 58BD2103C8; Mon, 15 Apr 2019 06:47:02 -0400 (EDT) Subject: FAILED: patch "[PATCH] tpm: Fix the type of the return value in" failed to apply to 5.0-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:00 +0200 Message-ID: <155532522032173@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 5.0-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;