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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 CB8B8C43331 for ; Mon, 11 Nov 2019 18:57:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AB5B222C1 for ; Mon, 11 Nov 2019 18:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498637; bh=2yS4gRpxf/2gEhhzNNa75eK9CfmmxLHaADM6e7yB17k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yy6BXfwsdW8w5nvY9O64DjOtSxjFiQsMX7L7pKTahsUj2TwUBZEgqu0icXrrl6Mtz tKVnQQuYi0h+AbDwFVPmfhpPfnY/oXO1XU0dD4+KwxrEMxIadtmfyINgJNWO+PTAkn pwYQ/waLrg+y5e7zo6HHucDVheEKe+bF3KtyZBIQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730802AbfKKS5Q (ORCPT ); Mon, 11 Nov 2019 13:57:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:56340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730801AbfKKS5M (ORCPT ); Mon, 11 Nov 2019 13:57:12 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 784FD2173B; Mon, 11 Nov 2019 18:57:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498632; bh=2yS4gRpxf/2gEhhzNNa75eK9CfmmxLHaADM6e7yB17k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hYrDD4QgUwA3u4i6NSLesnurV/ewjoQxwGSwzkd0wItKgBXdC7UrY6EEON3JaIjOj bGW5bEBceNqZ/VWryc4h14r9X/ParE6TBPSOYza9Rkvj35hdij7LqR5T2smAKn1zIl RPcEgok4L7UWGl7I9m2PEZ2s0zSdHPig7bWhUOyQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Jerry Snitselaar , Ard Biesheuvel , Jarkko Sakkinen , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , linux-efi@vger.kernel.org, Ingo Molnar , Sasha Levin Subject: [PATCH 5.3 175/193] efi/tpm: Return -EINVAL when determining tpm final events log size fails Date: Mon, 11 Nov 2019 19:29:17 +0100 Message-Id: <20191111181514.033406325@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org From: Jerry Snitselaar [ Upstream commit 2bb6a81633cb47dcba4c9f75605cbe49e6b73d60 ] Currently nothing checks the return value of efi_tpm_eventlog_init(), but in case that changes in the future make sure an error is returned when it fails to determine the tpm final events log size. Suggested-by: Dan Carpenter Signed-off-by: Jerry Snitselaar Signed-off-by: Ard Biesheuvel Reviewed-by: Jarkko Sakkinen Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Fixes: e658c82be556 ("efi/tpm: Only set 'efi_tpm_final_log_size' after ...") Link: https://lkml.kernel.org/r/20191029173755.27149-3-ardb@kernel.org Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- drivers/firmware/efi/tpm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c index ebd7977653a8e..31f9f0e369b97 100644 --- a/drivers/firmware/efi/tpm.c +++ b/drivers/firmware/efi/tpm.c @@ -88,6 +88,7 @@ int __init efi_tpm_eventlog_init(void) if (tbl_size < 0) { pr_err(FW_BUG "Failed to parse event in TPM Final Events Log\n"); + ret = -EINVAL; goto out_calc; } -- 2.20.1