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=-13.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 B5E65C433F5 for ; Fri, 3 Sep 2021 06:22:44 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D87E16101A for ; Fri, 3 Sep 2021 06:22:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D87E16101A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A25A83503; Fri, 3 Sep 2021 08:22:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="Nq1cDGhP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0877C8350F; Fri, 3 Sep 2021 08:22:39 +0200 (CEST) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CE5BD82F33 for ; Fri, 3 Sep 2021 08:22:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630650154; bh=L6v8ZMQkztQ7CCKhnuHix/c5hmltObk+o5YLKZTxHFE=; h=X-UI-Sender-Class:Subject:To:References:From:Cc:Date:In-Reply-To; b=Nq1cDGhP5hS+/uNseh+YDDDOSnlwrpZcnWiI36W8kUA+CdnzhYC/fZHSMXELX+w+m l3/FF/0raSNVPMJCA/Ps2NJZa/KpBRs1wmfVt3XgX+92oUD74vaN+64Ii3AFl+hClm Gbu2BAgz9O2uiYhl0IBL5PPwNaoxnKk8UwSXttzg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.123.35] ([88.152.144.157]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MoO2E-1mk2fi0orQ-00olew; Fri, 03 Sep 2021 08:22:34 +0200 Subject: Re: [PATCH 3/3] efi_loader: fix efi_tcg2_hash_log_extend_event() parameter check To: Masahisa Kojima References: <20210903015552.17180-1-masahisa.kojima@linaro.org> <20210903015552.17180-4-masahisa.kojima@linaro.org> From: Heinrich Schuchardt Cc: Alexander Graf , Ilias Apalodimas , Simon Glass , u-boot@lists.denx.de, AKASHI Takahiro Message-ID: <27ce80c5-5f79-0789-f965-1bd09644d744@gmx.de> Date: Fri, 3 Sep 2021 08:22:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20210903015552.17180-4-masahisa.kojima@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:6hewuivQP1GRNxicA1X2ham1egEhibhd0+jYiqoRTwm/cY1mRgR WKaIiH2yogBJok/EbBTnfoqjE91jwfZEjmemNSIrwgRIjX9+jBQ2YpYQxEE0JaQxrJLxsEE d9ahKmt7MJwcJVCMGdQlmsGoqqYRxZWS6slgRG12Q5AQ7MhGUtz8zuhn6QHUmHwFIQACs1h CjjVvAfyV4mq293vwKvOQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:HuvuwPepQv0=:utirH2EkaVbTneFi94+Psj s5RCYuaqFJF2YhfTqM/lo9RY7d0/WfcH3MKb0YELAFmPmQKmZeeiuvfnCnBS4s8WiAITqGoua CHNigEzKlQlEH2GvVRWJSFPewowhFI+RiIiL0nFcHz2IsuXvVSqzJTnGd7fZJ/4/2h0P06xAX 37Z4E+O1lR09Zkd1DwSc6PTBJgmtYplJaSfeJd+o3nb1seK+5uK7orLZeltDXnbtYpvbrrCkZ wMjngZmLU2KyCccbvnTmWsj38BVnk560f2J1JQ3giAPfGqnOpBYNPCMvc4NLX9MOxSDVbf+cr pQ94vgVwF/cbyLHtrdRbRRfqrt/vTTenXvILi3g1rQWflIBAxuCtcy6hP31f3/llntQRqSJps rZBFptGdrhMgzLD3l4pNdCyaUbTEepGO8qdNTJmcqwVHJCIfA9tYWut5UQxuGBZEnjbkPi9qc ajr0Rc3ShUgI3TEZD6ATeWmNDFaN9UF7yoanTN9bh17B9PUtIIuPDg4Txczw7K6O9IdxIaRsR EueH4SYgibRLpfp/ih01Nj+oTgvdGOxpYcvaH7o23ceQabi3hAM8LJL6WzocWKQZINf0xfyAz cbi6ggPY6BwbSW1PtHY7Iy4rMQ3SOKRl9nR0BU7KX3NeLp9HJrtoGKnfJOmtqGuQTUGPXrTys qlzT2spj0X7dwTTnymxPyIGyJGFusCtynBibRtewHcslRESUKQ9IL9gb88gdzutgcB9f3Gjf0 P+tYXDRUtGS1HdfyZL/+txeJDnKEOjnYYrK/ZbEjgtIxTJK/7ZTWnS6riRLIW7w1/vS6C/qkY 1ItSjpcWz5H03BUNmXDIgMCASmD5r8kZndU3rmRLlyhyUZPxZlhHumDoGDDvY8T9rRwqIkuJE 8wU9NBds8IS1p4Q0MA8EE9OEhAwGqslI4FlRQ2NSWg9FOAPHLdjrV0QW4KJRWGReZhj/ReBnW 03LytKrSCxg9G+1clEDgQ1B/qoXIzuR31omW6tq49k9vAVgoW523PCniQAS0yYC1gRaN3eRs5 L4LGz5X2KEkURhFUiTMhWfVINLDh4GIWrO0K1dQGx8+fN0N34nyjwHDN3rrNGFVoYEZ0M19lk 8b9jNxrnQdnuOl+YLeghVrBoI7zhzrh5NIqhay4gFCcfJVWBQBU9oqWVw== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On 9/3/21 3:55 AM, Masahisa Kojima wrote: > TCG EFI Protocol Specification defines that PCRIndex parameter > passed from caller must be 0 to 23. > TPM2_MAX_PCRS is currently used to check the range of PCRIndex, > but TPM2_MAX_PCRS is tpm2 device dependent and may have larger value. > This commit newly adds EFI_TCG2_MAX_PCR_INDEX macro, it is used to > check the range of PCRIndex parameter. In the U-Boot code we have TPM2_MAX_PCRS hard coded as 32. Can the value be less? > > Signed-off-by: Masahisa Kojima > --- > include/efi_tcg2.h | 2 ++ > lib/efi_loader/efi_tcg2.c | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h > index 45788d55d5..b647361d44 100644 > --- a/include/efi_tcg2.h > +++ b/include/efi_tcg2.h > @@ -28,6 +28,8 @@ > #define EFI_TCG2_EXTEND_ONLY 0x0000000000000001 > #define PE_COFF_IMAGE 0x0000000000000010 > > +#define EFI_TCG2_MAX_PCR_INDEX 23 > + > /* Algorithm Registry */ > #define EFI_TCG2_BOOT_HASH_ALG_SHA1 0x00000001 > #define EFI_TCG2_BOOT_HASH_ALG_SHA256 0x00000002 > diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c > index c4e9f61fd6..b268a02976 100644 > --- a/lib/efi_loader/efi_tcg2.c > +++ b/lib/efi_loader/efi_tcg2.c > @@ -958,7 +958,7 @@ efi_tcg2_hash_log_extend_event(struct efi_tcg2_proto= col *this, u64 flags, > goto out; > } > > - if (efi_tcg_event->header.pcr_index > TPM2_MAX_PCRS) { If TPM2_MAX_PCRS were device dependent and could be less then 23 we would need a check against both constants. Could you, please, clarify the issue. If TPM2_MAX_PCRS is always greater then 23, please, mention this in the commit message and perhaps add a comment in the code here. Best regards Heinrich > + if (efi_tcg_event->header.pcr_index > EFI_TCG2_MAX_PCR_INDEX) { > ret =3D EFI_INVALID_PARAMETER; > goto out; > } >