From patchwork Tue May 11 06:39:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 434164 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3540226jao; Mon, 10 May 2021 23:39:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxl/yvChBtWarIhrggc9rSmcvAbPM9iKB/kK2vxIj4VCdPAUzHMzppO9X0FRu5fnPG5r17N X-Received: by 2002:aa7:dbcd:: with SMTP id v13mr33870359edt.59.1620715181996; Mon, 10 May 2021 23:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620715181; cv=none; d=google.com; s=arc-20160816; b=HQsG/JndMM5LOAMkWkMx4vVXYl1hweIOJEX1hdqPalszN9Ogq8cmJeEfEhvusNMkZe P4TJr/fAKj1n/s+Y6Xsw8nKTuzxrAlN1+QQC8mOV6IxRcdR3QZOhcsMYnemY33kNnC9h TyxrXbq9miBugd8fMLM9mDvDzG+qrX3NHILmFgo1mAcFS5u/CAqMhgv8mQN9diNWwxJw U5TBPhlcTMqhS9dq6Y7M94HLR+sXw4j04xQ+ufaRQ/AD66TTZXuZx1iDFMuHEtA37PwY 2bHhphI9HJqB46xaaO+YvpjEZ45GCeOZp+WqOm4PPZbSQ4afWBp9y6suPzjCwhK3KQw6 HKWA== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=4N4de6UCd6i1ZOzyASsQI8BQCFLX/XQrFKJIvSamxFk=; b=hUCUkoSPLzut1G1B4uWf6twYwsby16kelA4LH+M6bA5d+RjL3BKKGtQHG8XE/CfT8n fGPGI03B+7vq6VtVbXhAM+X/MooMgeWQ264+D7LENmDymzzEOv1qFcz8IEUUq1Q1Fb1G dw8IRpIQSpqZMqy2gMICCIrlA5urGJfxCVoyP2olTdNcOfk4LuHu/LPKHtCs5VH1ipiJ XlU4ldxilCtRnfYZ7qoO2bkx2Q7LcA2QOrA7qG6T9I+AzgY1n6NkV796/VvHxHkz8gCp y2iZCaxCj6wHLhOZkyNN9v+XplvoomesUPZ3QgmTNiB3faRxJ6J8CO3H7XuBGNsG6RYE 6WSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=fuZr15gJ; 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=fail (p=NONE sp=NONE dis=NONE) header.from=gmx.de Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id o19si14776392edq.609.2021.05.10.23.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 23:39:41 -0700 (PDT) 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=@gmx.net header.s=badeba3b8450 header.b=fuZr15gJ; 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=fail (p=NONE sp=NONE dis=NONE) header.from=gmx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93B6182F2F; Tue, 11 May 2021 08:39:40 +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="fuZr15gJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D509582F30; Tue, 11 May 2021 08:39:38 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (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 6DBFA82F0D for ; Tue, 11 May 2021 08:39:36 +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=1620715174; bh=H1RJ580E2vX3zauSgZl7MC0pGYzmce7a+Daf/UiD5A8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=fuZr15gJlK6gGaL43UGzC5d43ULFf4LzxcIKBfrC4TjBo7Q9XDiLGJHP6A4rs63N5 DuJURp+uUmuudHACht1VFI01/1ZX4smCYKhb93BRmdaZUHN5s++HQrSXYVMw823zqm jOI9aAOrWzqeabVCpGgmzy8VipoiFtqQzVsATD1E= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([62.143.247.63]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MC30Z-1loIfL0rHx-00CUfX; Tue, 11 May 2021 08:39:34 +0200 From: Heinrich Schuchardt To: Ilias Apalodimas Cc: Alexander Graf , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH v2 1/1] efi_loader: Uninstall the TCG2 protocol if logging s-crtm fails Date: Tue, 11 May 2021 08:39:30 +0200 Message-Id: <20210511063930.10500-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:Di9f8xIi67WNYVW59+j7e82/Lj8eV4M1iV088pbep66GFuzR7Q9 O2UBzEKpVpv2lv7tcVY6zrPt5bhDaSj6MnOMqLIP/Zac9y+imnGwL8eggKNZkPkxhc834gR Saj9eJxeqU8iqiSGmkiLG7JewI4bix3l9cuIbsFP/fsJJnINSTn0IZcpnT4xDVg2hezGaxC XCXvVHZgfwWu851R8Nxyg== X-UI-Out-Filterresults: notjunk:1; V03:K0:g/BKmSOr0QY=:QgAn8CUtbbtwensQWvtORw ze/ILHKi8Kby/abZ0UXvBR/IPZNbH5RQpy6gFvxDvU0NaV0C8GJYYFUE+CXYJHmhP+uAxvTTC zPyMRISZx0bJLDswy2L/Hr6Br0C8QZ/3UfdB8ILF0KbfCNqsN0joeMgwwvuLzjLJw5AE5rWgf RBKzaGMktJvRnYtAjBoCWpMrTdbbLnI3B+of/EU9ZYumjgyQKs7YnY/vHvz015mOwZOui1BVp XI5Gj6pc/Cv4APsZ8PTvCp2bEn933ifO9KwYSuHp/sTnYwxtQCHVEJ6bvFL5THpQKJnDhU+nb PBp195qjxVBhZQj5K2pkltSdOPcOV+xcF5JW5ygu647YDMAFGZRlu3WAy8+27+SyEHtM/Vy3Q IlIqyFtLVG65Q0nPsbu0/YtWdAO2sJQe+o/WeDVMO/3EN6TgSGxeJGFWXoXTS/Ws6DbMMDhao vpw1u4haAXf7351MEyoNdia1kICOTor+57cDjaC2U1af7xR3qqkfjBfPkZsfrSnhGy68Obuoh uFJm8ZcyrmxnjEdxsRl1qhs0z0O+OQ+mHvAwWfWhhpQh0YY3ooUzX05za7UbpQ+ohprUp+uQv BO30YbZudQn8IPMTvMrxgzwpHEePKdr0cslsWQhiZsLy5qkU/YWrgisxf9Xp5xQQxdWaHqD4H p5uBIC0DBKGZ0QctsK9O8ZMKLJkOETZrdM4weXZTeoZdH3K4Ol+kroq39zUI6P6DmRR1rLcJ0 VvWgoiUewrqBIUdWmYV13PyuOG4qe7GBQnp5w0nQjHA+Oa1aNptcmfJkFcS4oh+qCrCLkGQzW AFYgLJjxd2PEUIW7oRtxHY3+hRlaIfaNHjoi2rPp5QjY6MLd3FzHQscSvZ9rCg2x2nkcU7D3D wL6+aGa6dYA/OC6lVDNX1qfPn4tBN60m7m6zdCmCOOZa/XFpC32GBGwYQSuAMAFzh3l1ExkLT IColjWzW7EBw7sQmwXTmbFGI3WpNI9fXgn6cra6qgDWEHanBf425PfsNdtrbR5NLlhqiMquW6 +MrnGRl9Fva3omJcEYDkKAv/EjZsfE/6gdU5T+uZ+eXH/9Va5yK2oAfnSDoYbxP4ZacZNBBCf lbiwION71aEN9qFZOEUB27hkddV0xUKkWLRpmwaUQW2pB8Tuttjw5xviNRfOF1yj/Br/c4P4r FQpfSaJ3fNg6nEwvMlcRPoWRibq76zuHMvByqnhNwSmm2iB+7/zRRu+dOybgm/AhQ3oTo= 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.102.4 at phobos.denx.de X-Virus-Status: Clean From: Ilias Apalodimas Instead of just failing, clean up the installed config table and EventLog memory if logging an s-crtm event fails during the protocol installation Signed-off-by: Ilias Apalodimas Eliminate label 'out:' by using return. Reviewed-by: Heinrich Schuchardt Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_tcg2.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.30.2 diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index 570cc746ed..4530a47b63 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -1103,8 +1103,7 @@ efi_status_t efi_tcg2_register(void) ret = platform_get_tpm2_device(&dev); if (ret != EFI_SUCCESS) { log_warning("Unable to find TPMv2 device\n"); - ret = EFI_SUCCESS; - goto out; + return EFI_SUCCESS; } ret = efi_init_event_log(); @@ -1113,7 +1112,7 @@ efi_status_t efi_tcg2_register(void) ret = efi_append_scrtm_version(dev); if (ret != EFI_SUCCESS) - goto out; + goto fail; ret = efi_add_protocol(efi_root, &efi_guid_tcg2_protocol, (void *)&efi_tcg2_protocol); @@ -1121,9 +1120,8 @@ efi_status_t efi_tcg2_register(void) log_err("Cannot install EFI_TCG2_PROTOCOL\n"); goto fail; } - -out: return ret; + fail: tcg2_uninit(); return ret;