From patchwork Tue Jan 26 11:10:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1431611 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::43f; helo=mail-wr1-x43f.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbj7qx6aamgqeh3lahhi@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=PNYpubHe; dkim-atps=neutral Received: from mail-wr1-x43f.google.com (mail-wr1-x43f.google.com [IPv6:2a00:1450:4864:20::43f]) (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 4DQ3rF6K8xz9sCq for ; Tue, 26 Jan 2021 22:08:28 +1100 (AEDT) Received: by mail-wr1-x43f.google.com with SMTP id n18sf9128644wrm.8 for ; Tue, 26 Jan 2021 03:08:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611659303; cv=pass; d=google.com; s=arc-20160816; b=HDwnReMNAs/RFupHUzUlLMXqoBvHBHUArTEYRod5s7KrTQoXpK+8CrApiqEsbCWLYH HnsMnPMzzITd5JEAIOtkSxlwGcAgTk8Kz9b/n6ZPC/S7JIZFQ708S5cBRf5YT9Cd8zzg h7ajdQwjMJdUq+qgpeEqXiXdYdzc+J6352njllHi1mQ/YM+NjqTHAJOgCu4ByXZwFHfj 8SqDQzIrT4ykwTyNp3fgfZXvXTL652qz9A/DZ5h9ZLt34STT+ZtpwAZOZpKrevuikc9U 2N8agNrSK1/sl9sd/h2JI020LQseiqNJNir/FkgeaJrBgtiHn4Eug3aRRxRRpadrpjo6 bcNg== 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=l9tcN05+u6oR4rU/Mr4RkMlikBwaG59/n63DRUA2CBo=; b=O0HaLYHCBkrZvgCSmoOYkElLOSBpfNluLvS91vtDIZClZzEypnyO3Y8O62qMh1BhR1 VkUDtDtZKiuEkq8CxNQj2RYOtX5CI1y3V4fLAP6yZVuE1V3adAs0XieS7Yi/siypX8cJ zFiOBn4iil6JPQDJurp+PGY1nCSV6D/8u+MInB4UwhtSn0e8nVB3DzI2o6iMejYbBl04 UgkijR5BNWX/ZgXgwpgce9jqmdwaoSNZPt03EfGt4Ee9XEDvN0RPQeeIPuZjua3ec09s 3V/2qctKkVq3aacGKxDZA+FvmFCjNiuJUYmibZXmUAaZAz1qyNWGoKSygWqV3jUbcgey JoaQ== 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=l9tcN05+u6oR4rU/Mr4RkMlikBwaG59/n63DRUA2CBo=; b=PNYpubHehw5a4bN93wpwpAGKWqb6ROw20HzcBx1rtjSZElnN2oPkVcYYzjWX2YP/Zn Ti++PtqFMln+zzETLSaGY67GPS6tUrtjGPcj1zmSjuFne8vQrLKGqDGnd3xp1vQgodxB UZH5hc2OZ+zWRIoJTyKyioXKj0PwjdLB837OlGjmePW+yLr62gzjztOIQdOo71z6dcHO qoDJguTu0oH0wGoWbVOiGJT+HwAOe+Ca1VnAadtuz1yr0y6ACBMCJ/jl7v/0XY0U3mLd 5pXxaSsIdaVfelN9EDkA3LjNLMPhzkRKSLrc5v6MNME2HYm2dOk+7vfFXiClpq3toB75 wIgQ== 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=l9tcN05+u6oR4rU/Mr4RkMlikBwaG59/n63DRUA2CBo=; b=N6l4cn1lq7Ak/1PfTmKxf+OqbocoDqwRGFOCSHWS2gP1xlDVfT7RBUQUfPRnGRLJ/X HxoB9KpbR81saz8MxQlON9/b8w9dSorW1FJmb+LZyfd53VFXbti0beJjwfT4efYCS/2s yQdTIV2XS1tF+E5CB+rysDx9JywQrXyyQgq9AYUyFsMLKV37etJbpcpk2uCrkJCXBtcB jfqVCcv7j1O1rxwrINmKIJ/HKoHbVE9rfl13WeEkHC9PPXimwEwpAWvWfITINqsnjzXE K3xNk5i3uYWxhoqW3sBgIdydE0E0K8xL4q73lixaWhCDNt9m67ltroxtClwawxFT07P9 sYYQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530emba+Ghjh1W0L+6LYaTyVOn2hHJ4ArqW3+qUD29IVQG5qc5q0 IuFIJeZ/KR6+hKqy444+Ggg= X-Google-Smtp-Source: ABdhPJx2CGl/6MrZpL+Jc0wZYW5dFJv/I8TLEBBD6nIk9FM/At+jYGJHJ7hB4fpsIquzIhF3yQ7pRg== X-Received: by 2002:adf:b78d:: with SMTP id s13mr5509324wre.344.1611659303325; Tue, 26 Jan 2021 03:08:23 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:adf:dd41:: with SMTP id u1ls575887wrm.3.gmail; Tue, 26 Jan 2021 03:08:22 -0800 (PST) X-Received: by 2002:adf:e404:: with SMTP id g4mr5418974wrm.416.1611659302547; Tue, 26 Jan 2021 03:08:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611659302; cv=none; d=google.com; s=arc-20160816; b=rcM3kmn3A1YEtgFkRA5hqQM0rR8o4JggHdam3ttVRuE8n8nHaSN+yqS2jUBmF8C6Hp qHch1D6vDEhKfy2dioxdKBe/o3BlREMIDOvOasb5hxjt8mrKEgcM8IguV2vlsuSxM3SK oRZwHPDFIOhzpjJEmHFg3+CS23F4TCbSACjVnPnNzYbfcm2ZZHtYpnN27aO6ijc8JnTW NGgCJjiK5ms4IvUYeyS1uiYmVde412MK5hhhbXxIDewjoOmskWB+uMjtXEfyAA1x4q+3 qevDc7VMqEecfNc+X/0n5Kkyeq6QuE3mxalvy85cuobrEXgLPHL6ydqvJauKr+LORKnY Ns5g== 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=qM/CL9Yj3v/iGDhzKAeaQGJJxmxIlUKIwQ/DCTDTc/s=; b=ub/uJYQdL+uGPfWHkAKCjf8XQ7WIfHKP8I09EjmvonAUAfwb3OSwWFyKLjshPlIxEp sKYrByjIMYuN+fsnKjR3j7cfb94JLTAK4Os14jon0+ESYUIbBweLcgKteGnKLQOG3Iy0 fOA/Ct6CGX9C9wVA2yDFS25TCWWfx+mVF81nPI628H5Zk539M5B7CfvP72Yc4C8TzgmQ in2MfUe2sz77iOHqT6isb4bMAYCiuZILb+U/PGA+/tSthtRLEM4xy6KEChHQnwXHqluS p5lcXEpJGYHPa+W0RX6vcZ3yBsqqLNpMXZV5vs127s65mAehUtQl0go0CAcU0ZUAl31m 6EqA== 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 w11si1013458wrv.0.2021.01.26.03.08.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2021 03:08:22 -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 mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 10QB8Mjg031598 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Jan 2021 12:08:22 +0100 Received: from MD1ZFJVC.ad001.siemens.net ([167.87.7.200]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id 10QB8LT5016881; Tue, 26 Jan 2021 12:08:21 +0100 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH] bootloader: EBG: update transaction marker handling Date: Tue, 26 Jan 2021 12:10:20 +0100 Message-Id: <20210126111020.10126-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: , Use BOOTVAR_TRANSACTION introduced in commit 0e7dfdd "Fix setting recovery_status flag in rescue mode" instead of hard-coding "recovery_status". Use get_state_string() introduced in commit 15dd8d9 "state: make transaction marker handling use state's functions" instead of hard-coding "in_progress". Signed-off-by: Christian Storm Reviewed-by: Stefano Babic --- bootloader/ebg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/bootloader/ebg.c b/bootloader/ebg.c index 0f35c00..98107aa 100644 --- a/bootloader/ebg.c +++ b/bootloader/ebg.c @@ -18,9 +18,6 @@ #include #include "bootloader.h" -#define RCS_KEY "recovery_status" -#define RCS_VALUE "in_progress" - static ebgenv_t ebgenv = {0}; int bootloader_env_set(const char *name, const char *value) @@ -37,8 +34,9 @@ int bootloader_env_set(const char *name, const char *value) return ret; } - if (strncmp(name, RCS_KEY, strlen(name) + 1) == 0 && - strncmp(value, RCS_VALUE, strlen(RCS_VALUE) + 1) == 0) { + if (strncmp(name, BOOTVAR_TRANSACTION, strlen(name) + 1) == 0 && + strncmp(value, get_state_string(STATE_IN_PROGRESS), + strlen(get_state_string(STATE_IN_PROGRESS)) + 1) == 0) { /* Open or create a new environment to reflect * EFI Boot Guard's representation of SWUpdate's * recovery_status=in_progress. */ @@ -81,10 +79,10 @@ int bootloader_env_unset(const char *name) return ret; } - if (strncmp(name, RCS_KEY, strlen(name) + 1) == 0) { + if (strncmp(name, BOOTVAR_TRANSACTION, strlen(name) + 1) == 0) { ret = ebg_env_finalize_update(&ebgenv); if (ret) { - ERROR("Cannot unset %s in bootloader environment: %s.", RCS_KEY, strerror(ret)); + ERROR("Cannot unset %s in bootloader environment: %s.", BOOTVAR_TRANSACTION, 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. */