From patchwork Tue Jan 26 11:03:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1431608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::43a; helo=mail-wr1-x43a.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbepnx6aamgqepejml4a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=Zy0naR9U; dkim-atps=neutral Received: from mail-wr1-x43a.google.com (mail-wr1-x43a.google.com [IPv6:2a00:1450:4864:20::43a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DQ3hV71P9z9sS8 for ; Tue, 26 Jan 2021 22:01:44 +1100 (AEDT) Received: by mail-wr1-x43a.google.com with SMTP id n14sf8405232wru.6 for ; Tue, 26 Jan 2021 03:01:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611658897; cv=pass; d=google.com; s=arc-20160816; b=Yg1sKRb/0SIcTslFl6nOphH1/tWr3JpW8dNGgVGPnLexJyMeq7ZQ3ZmOjuDwjBTJdx v+d9XIYpslzkzfRH/xMLYk7x0bX1pMJdDAqelCg0mdZheGmbmSLNJCZc0uSBFoAMfQE8 FyhOk5BeozyR3FEHJjs3jUpG02kIw8f65eLSTahiqqYxr3n7xs7zgCSGdWsGR0UvArvC WyzPCUcB2G34WBjX+5KKXOvRqRZjrDhyvGTLF9eqd5lusfHnP5uZ+4oqeTvI3wJmpNAl J6qG72M5yke18dcNBiCn+Ms+PFlOc7a0NQYeBj5ieN6ldSgxAsxyEaYEKCsQa3v1g/RS NmOg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=L9olw9q/84i/QXApE1q4i6BeUaLMUd3JTgopBSc6+RQ=; b=rblb1NsMGHkOGgRFr/mgewB1BLCGuMEmgcjOaqtmTuyJAifxlRUpe+ZbLu8cgrUzCK 0H4aC3DycIDVDopLTU5yXNslPt9L6HfiX+mOE0WxRKYm7uiU8bJIDcGN7gjyJ/0AP1jz MTk04TEOrCs3FiNCSAtcevdwW/gHig5/E+wBy77F/gYHOiL1ACjZyNWccV1z3vusE++w ulkAKrdmRkjNESkQx5/OZCVM/QQCtWSScvoTihQvnyLNd/HlgwonXEM2r6pYylcrzCcO G9NEX4EXmZqYaFDHVyFHBaQz24cuZNO33AQxGsQfOLb4IjvBcFci7gQVmj0ZYbMIC5SJ ZSmQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=L9olw9q/84i/QXApE1q4i6BeUaLMUd3JTgopBSc6+RQ=; b=Zy0naR9UdC2xc9i7lnfFGRX+T+qthFZwFv/5oVSpxEBjZU9iEVHC03hJ+Wf4HjGIns hlth0NCQkT5D/uZZqX7ijUOL6BztefjF6twRVZpbbuRhz/q4JCJ0E6d9+iv+tpy0oS5A wB7qLFNOugxPIAxblxTVdJ27ffvT7g9mhQJ6GtZh8ZhoGDeL7dQIQ5aGHd0K1xRjdS1b XiLlqiMZunjJiNMGph6oW70ARMX0CPgh/qJux7JPR/mTWeJbvjPq46CCEDVK5pDrmttV MvpFPZaKaJW1qywgpueoYtlN8OmlCiHX6n6hZH64uTstK4RE7Kkg9Y6A9EnaIZJmS+Az AAkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=L9olw9q/84i/QXApE1q4i6BeUaLMUd3JTgopBSc6+RQ=; b=BG3PUr6HzmDWAZoRSBKtwZZZjjm5oHvFDUqwQf/mx53uv198NBDU+pMrsUbq4ELsqV 0pxJtusIjjo7E6ljVOXuzX5CIvOwrKbtFgLbVxEGVI68q5mwI3Ucewn84j663ZILfDZY aCwB0yMeGp/dQyBQHMsu37fwrZnK+ELvCqFNtiiFreGuE+uTZgHGzEYM17WLY8Opj5y9 KJ07GL3lPYE2ejB03b26SgzC34EgTgbKLJGqLBvh9RHXiZg3qI7rjLWgbLFGYn82rW/n mIeBZZqxj4pBd6m5VxxyTauEuUyNwOLPUlpasNLG8J7Ro/mUoCw118qyKB+fAluYRHV2 i3IA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM531me8MTztGPz+g0eGYBTREL80ldcf09GZLN0nGax7/+q86QraRC wgiEhoYGoH36/jqoZ9aidG4= X-Google-Smtp-Source: ABdhPJxk7UWn3xhI+Cc1o188RNP1CQnbL/uCFEvYaYklDGdxv4UaOOQ+VxiYhhtncWn5VonktncBEw== X-Received: by 2002:adf:9cc4:: with SMTP id h4mr4264161wre.403.1611658897734; Tue, 26 Jan 2021 03:01:37 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1c:208f:: with SMTP id g137ls1081370wmg.1.gmail; Tue, 26 Jan 2021 03:01:36 -0800 (PST) X-Received: by 2002:a05:600c:204d:: with SMTP id p13mr4256038wmg.42.1611658896673; Tue, 26 Jan 2021 03:01:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611658896; cv=none; d=google.com; s=arc-20160816; b=dvP/QOh46HwkHCAlDSAf7xe6+ka74sd8pUn1Du5sDDJ8MJZcin7muGgFv0XIHQTddX ydkSCUQ33l0KqFk8O73a4SV/mazO51kCP1nsqSj4zF5+qp9A6GcqyqF62u3sZQ9c/Rwc TpiSPm62m5K1fG/G4fzw0AzsYMy/bkqns0Ya+sYtFgPkrnrPPV4+cgOjSCFMDxfbyC51 sakXbdian9/kWjtU6eZ2IoY0bsfXMbwVTpCVu5wF6nUS0+Vo1fqnG2XpMCbW/293/WW6 5C2OiD56MhyE52O5VZjZHg6I2+CaJnEecZxGlJ/SJcMGeyoiFb5j1W5bd9alh+uSvyEo Bwhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=IAiG18RcqU3IzzXK+qdz3mkiSwwKGUdDFUFf//kSGSU=; b=I51PGGdEsMKR8P5YATL7XpdNinCjU++BsQrlZAy5tqbS4ToMjMh2q9ceJiPjS9Nh2G nglrYxz1LzfrDAMX6GFtVYoYn4Zhk89qAzreFi6LZp3XbK5+ydTODZnA8kGWQYeRXzqW L0uJn0WWqAgmN1GVPr7voQnGw61MBPyPbQ6y1sOEG1M5DC7mgpCDeizuWRIPV5o6ve1Z 2nsMt8FWad6w0+mlD15JyqxHt0wBInFIWdReqhVqM1iQ4zkljr9PutkC5jniMxccfH78 f0HkQ8ijoRa8JEaKU76lL0cF1nK5a+ZvQIIWHVLwqk2dQDCAXN5Lcn8quw2RnFKSZP62 RZxA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id z188si130376wmc.1.2021.01.26.03.01.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 03:01:36 -0800 (PST) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 10QB1a2Z007706 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Jan 2021 12:01:36 +0100 Received: from MD1ZFJVC.ad001.siemens.net ([167.87.7.200]) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id 10QB1Zoc005676; Tue, 26 Jan 2021 12:01:35 +0100 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm , Heiko Schabert Subject: [swupdate] [PATCH] bootloader: EBG: env_unset(STATE_KEY) ~ env_set(STATE_KEY, STATE_OK) Date: Tue, 26 Jan 2021 12:03:29 +0100 Message-Id: <20210126110329.9392-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Unsetting STATE_KEY (CONFIG_UPDATE_STATE_BOOTLOADER) in EFI Boot Guard's environment is semantically equivalent to setting STATE_KEY to STATE_OK. Signed-off-by: Heiko Schabert Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- bootloader/ebg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bootloader/ebg.c b/bootloader/ebg.c index 321c34e..0f35c00 100644 --- a/bootloader/ebg.c +++ b/bootloader/ebg.c @@ -86,6 +86,11 @@ int bootloader_env_unset(const char *name) if (ret) { ERROR("Cannot unset %s in bootloader environment: %s.", RCS_KEY, strerror(ret)); } + } else if (strncmp(name, (char *)STATE_KEY, strlen((char *)STATE_KEY) + 1) == 0) { + /* Unsetting STATE_KEY is semantically equivalent to setting it to STATE_OK. */ + if ((ret = ebg_env_setglobalstate(&ebgenv, STATE_OK - '0')) != 0) { + ERROR("Cannot unset %s in bootloader environment.", STATE_KEY); + } } else { ret = ebg_env_set_ex(&ebgenv, (char *)name, USERVAR_TYPE_DELETED, (uint8_t *)"", 1); }