From patchwork Fri Jan 28 22:20:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 537623 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp66085imr; Fri, 28 Jan 2022 14:20:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJPTM2Rak6lr9F1gYuMlLzgp5R+HWSzScBwT7+GECDlOsPv/drbi3HuOisE2DblDaOkSiK X-Received: by 2002:a05:6402:19a9:: with SMTP id o9mr10064727edz.295.1643408453038; Fri, 28 Jan 2022 14:20:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643408453; cv=none; d=google.com; s=arc-20160816; b=AEbJREHHMR8yM/9E7zPa6aQeRmiSOGVCeNBpOESo/ZheLjzi6DJwvQ86YbRTrK/CfF 2sfSmQA9efHCd3d/CLXJXtX51DuIuUGyXXCpIdUprvF0c63w52YRazrGyiRmC8y8bA3Q Q60suhP0nmRcAGCF/6TqS64/08zIgMcS/Mn6tkvhG6vLoXMtg7q2SJH9kBotXTIhVKA7 3r10wlGaUnZjqQ8OIe+3Ue/XHxPaGQy3iPM9RTw2FNEa8Nq1LiW7l9uiBTofEfEzErzt 0WC1/ZIFKicIDS7jnM1bH93TkUhwDIPxNr/TGXxklKpwo+SEydM/e16GEiuOXPGqtNZn 1NwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2bbnspgOJ+CewXWgoW/uVc/Nb7lCKkmOxOogmnj7JT8=; b=y5BbKDpqe9Fp5HTh+fDBSjYPeTau71wj4s6A/hf4OLl/qyoKFzBr5LKxy9KN2QMMQf RQrGGdAxzZswkBE3mtbAEFhdB2lfdiSxsGKGR7aRWkfvVqk6Cgr5WXjefit4j2TukFVR IxyGXLp9FdxHa3TGUe2BHICZD+8tF297/hsv3ja7mXNw1i9ln/jaNka2MeDLX6EvX7j3 oBvU0k5M1HyI7ieQdqGizgPvbrV1dc93wpy0Iv73NUqqYKDSETuys/+1N+D+yJR4vCe8 qOWdXJST0C8FwYDpDukocdaKFvQQoLvzfJxmfNsoC5lpdf4m5jApxJaWLl23ePfq7Rw7 WN3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tX9itMfU; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id m25si3528536ejn.613.2022.01.28.14.20.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 14:20:53 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tX9itMfU; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 98AB3837D2; Fri, 28 Jan 2022 23:20:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="tX9itMfU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C017E81F0B; Fri, 28 Jan 2022 23:20:39 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4467282DB7 for ; Fri, 28 Jan 2022 23:20:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x531.google.com with SMTP id l5so12590678edv.3 for ; Fri, 28 Jan 2022 14:20:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2bbnspgOJ+CewXWgoW/uVc/Nb7lCKkmOxOogmnj7JT8=; b=tX9itMfUN9ZFb6JUewwTMuFY2WT4mfxO0eah4k3AIcf0XzZixrDHV4aIyUtsMuKy6W s8pJ7Oty4Qk/11VUFaJmJoXFBjsOw30MeF4D4PKXp8lCk0QJmA69nHWfu1i3NATk8n4E mkTWMu7lBZE0YvgYYt0zPlHiTt+Szh8wMG/4UDuHsIeJdw5iD45Z0Qd6tPncpv0966I9 5x9GRqu5rAoRHibEYw+/d48DgGbW/x/A6l2ZL8vyVqqxWxx4xb3APhnSOiAKpvu2gyky 159gBBYWAlP/9vYYnbZfwO7xo5EgidcI61dGVl/nikPNDT5ltUDVvJhWgMkjZYKK4Frz ClSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2bbnspgOJ+CewXWgoW/uVc/Nb7lCKkmOxOogmnj7JT8=; b=qDiHGn81ZWxaiGq9b5Zb76WeAzMBmWWf0+++09c0EyMjGUVthl8oTfQdXSGqX6wo0Y oDlOrgPdHhQGUG85PmP8GZHkgD0UFVaWmLMpfeL4NSLA1pkMPVIeIpcXk7+UgAanPph2 ZlRIe9HJFOprwuTuhHhBqhO1FpObuIUDbye+MbfxaLM0qYN4s808sTKPlu0kLX7/e77I EJHVUvAM6tFHDhFjY9Y8eqvXJx694mAFY2xCiUQU+2H0WOFHLvVqwNBoqXOSidbovekA aDmP8pB7EgeBW/YaJ7WZJUVZidoBdo3q+DvsOVofh7DIzAXvDwFhscJQ8DKdu5qM7Wq7 1QPA== X-Gm-Message-State: AOAM530afOeEcpsreGPQyb7mcJfdj4fjCpmZEkr3C1Vbnhs6B33QlV2b uWcXDoWtDYWtxosM7M2bhoIR/g== X-Received: by 2002:a05:6402:520b:: with SMTP id s11mr10132942edd.365.1643408436878; Fri, 28 Jan 2022 14:20:36 -0800 (PST) Received: from hades.. ([2a02:587:46a6:e776:230:64ff:fe3b:505d]) by smtp.gmail.com with ESMTPSA id v23sm10575038ejy.177.2022.01.28.14.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jan 2022 14:20:36 -0800 (PST) From: Ilias Apalodimas To: xypron.glpk@gmx.de, takahiro.akashi@linaro.org Cc: Ilias Apalodimas , Heinrich Schuchardt , u-boot@lists.denx.de Subject: [PATCH 2/2 v2] efi_loader: hash the image once before checking against db/dbx Date: Sat, 29 Jan 2022 00:20:32 +0200 Message-Id: <20220128222032.1772860-2-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220128222032.1772860-1-ilias.apalodimas@linaro.org> References: <20220128222032.1772860-1-ilias.apalodimas@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean We don't have to recalculate the image hash every time we check against a new db/dbx entry. So let's add a flag forcing it to run once since we only support sha256 hashes Suggested-by: Heinrich Schuchardt Signed-off-by: Ilias Apalodimas --- lib/efi_loader/efi_signature.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index eb6886cdccd4..1bd1fdc95fce 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -192,6 +192,7 @@ bool efi_signature_lookup_digest(struct efi_image_regions *regs, void *hash = NULL; size_t size = 0; bool found = false; + bool hash_done = false; EFI_PRINT("%s: Enter, %p, %p\n", __func__, regs, db); @@ -214,10 +215,12 @@ bool efi_signature_lookup_digest(struct efi_image_regions *regs, if (guidcmp(&siglist->sig_type, &efi_guid_sha256)) continue; - if (!efi_hash_regions(regs->reg, regs->num, &hash, &size)) { + if (!hash_done && + !efi_hash_regions(regs->reg, regs->num, &hash, &size)) { EFI_PRINT("Digesting an image failed\n"); break; } + hash_done = true; for (sig_data = siglist->sig_data_list; sig_data; sig_data = sig_data->next) {