From patchwork Tue Dec 15 16:50:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jonas Mark (BT-FIR/ENG1-Grb)" X-Patchwork-Id: 1416505 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::13c; helo=mail-lf1-x13c.google.com; envelope-from=swupdate+bncbc6ynavgsakrb4e24p7akgqe7pdkysy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=googlegroups.com 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=IZcK7fci; dkim-atps=neutral Received: from mail-lf1-x13c.google.com (mail-lf1-x13c.google.com [IPv6:2a00:1450:4864:20::13c]) (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 4CwLn303dDz9sTL for ; Wed, 16 Dec 2020 01:51:33 +1100 (AEDT) Received: by mail-lf1-x13c.google.com with SMTP id i7sf10649348lfi.4 for ; Tue, 15 Dec 2020 06:51:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1608043889; cv=pass; d=google.com; s=arc-20160816; b=VwnQlswidXUUCvLGSPMyQHtlzq4UaA/4oyd5PA6K8Z6bxeMK3edBOkN01yXmZ9ECeD 4Oe9Cyu/zYZ65mfuBvHlVE/6Cq2H0IGyWbH3e1qVyRzp0sFgLPFilqVlf5QSBB2jNyHB tedXECM8+Dj71kGwqSWDaUMhkbRpUs9+O1sVCx/AQTJC1TtvbBOsV7qRXidqn9F6FDYx Akgw/gH/LdbKkuG39pP26YC46VprD25mf9O9n0lID0cCYek4Jb8WaWamquCVjdhk5/h+ nahlR680IlwrPq2SKkwtXLjVjaF0enhJK4d9PsAp1kgvEzthu65K2v6ph/s9UltuzpRl SmYA== 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:reply-to:mime-version:message-id :date:subject:cc:to:from:dkim-signature; bh=UYzFe/mO+yoIvv8hOvqTRsDoC65lz1Z4BaBNPW8NfhY=; b=FhBY0JPZSPpJ+hZiRNk2WqRQxaea2LX5pJR/lUyeR+ZfRH5uZbiM7yB0Z/s4LUkU0Z xGn4sSaF5y6Q9sN2qX/I9BX+1fbRvmJkuJtjC2pCUuAO9UVV8aENbwPHYDpQG98JWy1G aysoJEizTRDHjvPpXNXLPMRzywqPbszMqcjMLt8pvhq6FlNcLFyyn9xOA2yM0Ln6pciM 2nqDhuz2/KQM4/7st4+QEEGM6i1rZO9DhcOCsN89KEQU61KNAEQRXgZthrnk1hpBarO7 VNu5ozxqC1ix/KKtoBj11ycONd6hbWOWqbb9Xd97IprDmYh8dCE2aRYOwqc8IEyaVJx6 obaw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@de.bosch.com header.s=key2-intmail header.b=fsrh1TfU; spf=pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) smtp.mailfrom=Mark.Jonas@de.bosch.com; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=de.bosch.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:list-subscribe :list-unsubscribe; bh=UYzFe/mO+yoIvv8hOvqTRsDoC65lz1Z4BaBNPW8NfhY=; b=IZcK7fci1nDSb0pWqeFeOE8A/SA4wQMvtugulMpQlm83GbfT6viXFTC+sxQBzVUmgt 7U4rKwfqZtVYxh74h1XxUVdXKTm3ZE0eK9bJI2PWBYKeXLAo88Iv9NZe86l+Vy+0J+46 BgjrKIXttvLENSe5lFjnX8S+zX+weeWwSBmMhva12bin5X4bwV33671nzB2A8ouBoa9q JMMUOVu192GhEYDki4hcP4oW/JZOHVjcsjOJgfCji1bPosHmR64Up7CehNWZmPUalwHl FSYa7d5nx+h1XEwz/OtTSvKNQhKgmYNYid3iwQVO2g2qYzONXijgZyGmXk+z5wjEMk6c X8cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=UYzFe/mO+yoIvv8hOvqTRsDoC65lz1Z4BaBNPW8NfhY=; b=FwctBdIc10abpdW7MdGIZvxP5+1PjH7qqhDsg4+zbWUrEL0WkezSiERKeWRzNtxerO OtjtTSVUf6K+lXaldB/ielhH6jwWwytUdhOXFAnmvAVie3eMqMKXpu7n7FI9Gy3Ooes5 v/k3X1LrDnWy0VTfZp5XPgSX8cDtIHG4mMatn+9ldbwGEyYgGlon8N98RIHsjTJbnfct ZiH4ZjdixFTzv2HRJm5I0E5OaOm76cnYR39hR8Ee3gR0iT6Szns96JyFbtLRrHtVb3TY bjwjciOy2L9VoEqIDuLthotGrPovKTBUtJO+LhFIuXZcurJMHyM6jBaKHGCjo0AKq66W KPNQ== X-Gm-Message-State: AOAM530UnoW6mNKK6hk+8QeWjhwVa9KqOELwE77xO8/iR197riKGyxTa pcPClXMUX66YLouNYXUIBzk= X-Google-Smtp-Source: ABdhPJwia1s+0MG1HKryj+VYrtDgyFAFHpCwSTDcphoUwnh7gT5pjiojYGp6iHUIwdpeB522RR8z/w== X-Received: by 2002:a05:6512:24f:: with SMTP id b15mr9739099lfo.379.1608043889618; Tue, 15 Dec 2020 06:51:29 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:bc2a:: with SMTP id b42ls4081951ljf.2.gmail; Tue, 15 Dec 2020 06:51:28 -0800 (PST) X-Received: by 2002:a2e:99cd:: with SMTP id l13mr13784310ljj.318.1608043888112; Tue, 15 Dec 2020 06:51:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608043888; cv=none; d=google.com; s=arc-20160816; b=dxxVHJ81iqVVOLuB8A/RKjwK0hVP8+cFHMnRwnCZ8dIlIjQkGGdZ/sYdHGePpqr2R9 rV4FuCS5M6jgl5KiQHxilqEcCp0OFc9UXpD0GR/lFFSVob/uBGGpMopw61kHZnxoxaP2 zQsYZlT72thH6rAjwzq4p/o8PmAAOw1fFTcWyArinsK60L5WYoFSHJcpy7mTyLGvK8aB UASEvXzPBS5yun74jqJImnbYiJyoHlAryu4ocXy4UxP1+W1TLkVUoAHW5PGiJ4PrO2ww Xu83S2PUi+jePNE3mKK/0H9o5S58pJ76zQxAdpiM7KBf3JNHGhG+u5C2oy0BAkGo8NEE pd7Q== 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:dkim-signature; bh=IqqHloEdq8FBtW5M1Yr0AG0Nl4A4BPJBX010poTWVvg=; b=iUBl45YTy5p6qEmY++kmPsCEXBsLvhqSlQkBopmNc/7y6YIPe02wDfLqI58lOEnjd7 gxfbrSx/77Drb1VTCxyoim6GFcj8kx7u8VtYwM+YY35pGrHyE2oBQpKt+0OWss95CmPU PJu4aKv0zcFW0U23E3M1iXX+pBHR/h/OUFb386+qINQYgWbDbh+4DSNXKCcud61prXvm wRir3WYdSvXKgoTAFzL4BFC0ApWjMRfv0spNpQlUOn24nyrjkVGqQYeDuhbI6z1t3kEI hYv1KudUSJpJw+AIZ2gvFpcTTwBR9ZzjWctKyuOtl03Bfan3Kxq7a058FQVbleFwQTMV E4EQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@de.bosch.com header.s=key2-intmail header.b=fsrh1TfU; spf=pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) smtp.mailfrom=Mark.Jonas@de.bosch.com; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=de.bosch.com Received: from de-out1.bosch-org.com (de-out1.bosch-org.com. [139.15.230.186]) by gmr-mx.google.com with ESMTPS id 207si670815lfm.0.2020.12.15.06.51.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Dec 2020 06:51:27 -0800 (PST) Received-SPF: pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) client-ip=139.15.230.186; Received: from si0vm1948.rbesz01.com (lb41g3-ha-dmz-psi-sl1-mailout.fe.ssn.bosch.com [139.15.230.188]) by fe0vms0187.rbdmz01.com (Postfix) with ESMTPS id 4CwLmv2S7Vz1XLDR8 for ; Tue, 15 Dec 2020 15:51:27 +0100 (CET) Received: from si0vm4642.rbesz01.com (unknown [10.58.172.176]) by si0vm1948.rbesz01.com (Postfix) with ESMTPS id 4CwLmv2Bntz4Rg for ; Tue, 15 Dec 2020 15:51:27 +0100 (CET) X-AuditID: 0a3aad12-f1dff700000020f1-eb-5fd8cd6f557b Received: from fe0vm1651.rbesz01.com ( [10.58.173.29]) (using TLS with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by si0vm4642.rbesz01.com (SMG Outbound) with SMTP id F1.E5.08433.F6DC8DF5; Tue, 15 Dec 2020 15:51:27 +0100 (CET) Received: from FE-HUB2000.de.bosch.com (unknown [10.4.103.109]) by fe0vm1651.rbesz01.com (Postfix) with ESMTPS id 4CwLmv1GRRz11ZL for ; Tue, 15 Dec 2020 15:51:27 +0100 (CET) Received: from luchador.grb-fir.grb.de.bosch.com (10.19.187.97) by FE-HUB2000.de.bosch.com (10.4.103.109) with Microsoft SMTP Server id 15.1.2106.2; Tue, 15 Dec 2020 15:51:25 +0100 X-Patchwork-Original-From: "'Mark Jonas' via swupdate" From: "Jonas Mark (BT-FIR/ENG1-Grb)" To: CC: Wang Xin , Mark Jonas Subject: [swupdate] [libubootenv][PATCH] Force writing of environment if default is used Date: Tue, 15 Dec 2020 17:50:25 +0100 Message-ID: <20201215165025.824324-1-mark.jonas@de.bosch.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphluLIzCtJLcpLzFFi42Lhslorq5t/9ka8wf6FfBbTd/5gdWD02DPx JFsAYxSXTUpqTmZZapG+XQJXxoSeOcwFc3kqGk+7NjBe4Oxi5OSQEDCROPx7KXsXIxeHkMB0 JolNuxrYIJwzjBI9uy4zgVQJCexglNjSqwRiswloSdw8sYMZxBYRkJc4On0KUAMHB7OAt8Tr qYIgYWEBX4mmPU/BWlkEVCXuLW1nA7F5BWwlNrxczgaxWF5i5qXv7BBxQYmTM5+wgNjMQPHm rbOZIWwJiYMvXjBPYOSbhaRsFpKyWUjKFjAyr2IULc40KMs1MTMx0itKSi2uMjDUS87P3cQI CSihHYy/Oj7oHWJk4mA8xCjBwawkwttbej1eiDclsbIqtSg/vqg0J7X4EKM0B4uSOK8Kz8Y4 IYH0xJLU7NTUgtQimCwTB6dUA9OSwym1U3bFzrqe8nyvCQObyC+pxVMvPaoxDp3182wQ327x mIX5wTHmKU/myG06Iuwvw77iudtM1aWXuAWnWzwoCDNlPR+eGMjH3fzST+qQXCTr6/in9W4P DT9KG84Ry6ntenKrZW/p9gkvj8byeX0Q27zNu/WYY71J2s3a/rxTsQ9S+LXNnM9xzfx1amXv 2xitCo/Xv+4+s/F/wPPKV/MH1yEVlcqHLz6sWVEaO1cw7n7HXM87jHP9SiNtbhw5tqojfppw +zXD8j2zXK9UdN6c8vVe0as57D0SAWG9swUOBu70MfFKspe6x3Xoupgzx0MF3V2TT89a3nEt pt1Hb8Vbhv3812oqvRXnO85OUVZiKc5INNRiLipOBABMR5tHlwIAAA== X-Original-Sender: mark.jonas@de.bosch.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@de.bosch.com header.s=key2-intmail header.b=fsrh1TfU; spf=pass (google.com: domain of mark.jonas@de.bosch.com designates 139.15.230.186 as permitted sender) smtp.mailfrom=Mark.Jonas@de.bosch.com; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=de.bosch.com X-Original-From: Mark Jonas Reply-To: Mark Jonas 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: , From: Wang Xin Before commit ed1a53ec "Dont store to device if no value changes" it was possible to fill an uninitialized or broken environment using the command "fw_setenv -f ". This was considered to be a feature. The problem occurs because fw_setenv will now skip writing the environment in case no environment variables to be changed are passed to fw_setenv. This commit will fix this problem by always storing the environment if loading the environment failed and a default environment was given. Signed-off-by: Wang Xin Signed-off-by: Mark Jonas Acked-by: Stefano Babic --- src/fw_printenv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fw_printenv.c b/src/fw_printenv.c index 8b830d5..44ad849 100644 --- a/src/fw_printenv.c +++ b/src/fw_printenv.c @@ -66,6 +66,7 @@ int main (int argc, char **argv) { char *progname; bool is_setenv = false; bool noheader = false; + bool default_used = false; /* * As old tool, there is just a tool with symbolic link @@ -130,6 +131,7 @@ int main (int argc, char **argv) { fprintf(stderr, "Cannot read default environment from file\n"); exit (ret); } + default_used = true; } if (!is_setenv) { @@ -172,7 +174,7 @@ int main (int argc, char **argv) { } } - if (need_store) { + if (need_store || default_used) { ret = libuboot_env_store(ctx); if (ret) fprintf(stderr, "Error storing the env\n");