From patchwork Mon Jan 11 10:27:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Fuzzey X-Patchwork-Id: 1424494 X-Patchwork-Delegate: trini@ti.com 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=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=flowbird.group Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=flowbird.group header.i=@flowbird.group header.a=rsa-sha256 header.s=google header.b=HP70YjPQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DDqf40bygz9sXV for ; Mon, 11 Jan 2021 21:27:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F1D782A48; Mon, 11 Jan 2021 11:27:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=flowbird.group 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=flowbird.group header.i=@flowbird.group header.b="HP70YjPQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A58DF82A4B; Mon, 11 Jan 2021 11:27:32 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x461.google.com (mail-wr1-x461.google.com [IPv6:2a00:1450:4864:20::461]) (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 842AF82A47 for ; Mon, 11 Jan 2021 11:27:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=flowbird.group Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=martin.fuzzey@flowbird.group Received: by mail-wr1-x461.google.com with SMTP id q18so15849163wrn.1 for ; Mon, 11 Jan 2021 02:27:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flowbird.group; s=google; h=from:to:cc:subject:date:message-id; bh=HziujR1z5pHdIRMSoeG9Q4jHz9zUXmo6oa7yssU4yaI=; b=HP70YjPQehVwhLxzyEufvdaKQEJqsrvBHRGuHvQzlDr/4BHCZJQsi67VFgaY0391EH BbZ88H3spCiNoyc38HFwrmP1CqAMjpgl3NXP08tzxhgbxVcT+0zmSk+Dnm6IcSZiVcEH sQ0oFFcHipcvn5xmMffRfTy6uPpfZO20m9nBsA9GXk7Cer0qHdKQvIGLfLSSc5BQuTJH uk238fbwG7iSEHhWVyAv6P8IZN+8UXjr9uKG7hpCb2axn70rdXnQXvv15nRvVWTLZs9q gICdbliorMqVYGJ5jxmRywyS4lDROATeMe8YrRcr3XB5j4Oh6eJUbxw9/nM9N1fK+hgn 6Q/A== 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; bh=HziujR1z5pHdIRMSoeG9Q4jHz9zUXmo6oa7yssU4yaI=; b=Hp1AEsbe4fDskhxLoIF8o2WyRz+OHteLGZfK2u/0+Z5wjpCSHDDCLTdq0pKzpq89aU vBZsyCI7YfyX54cQkcGyWbltzctYLXUZ1X+nB/FTTErqLhSWJYj9UcUtr/zq7MRSxSmh XyHZfQmoEa2ivytTqDaoN1nsQUe3tUKDCucFUbvr/OjwXWtKCoaLRSKU9QnmaaXRc0/B tlriLO6yRbQfp8n0gSSZeAcRA7j0rfbMwlf2hfDUgnq7aabBdC7xe+NTmuo+9Q8XdLkI 9yIzqZD/jsoF1V67WzIRzav028Do/CnDpJNJ4ZRiS6L1uTJKC4GJKddThyE3MLzLMp9g T6oA== X-Gm-Message-State: AOAM531MjMshwduW/GHWQ1Lgbw256gZqQa145xcXzfzGrbqXLXZmw6/n 1dhLRmR3iBELRfOBL1TAabgBoEeGJdvpddZmb3P/khGYfQ8oob98v6QJBZ/BmBBPgZwO+0nVYyp A6IeqpqM1wT2/eq5uxeDcqlgXsMc4/WswO8lZX+M5y/ubR9XGYrGZ0l2N1rIVVhcrje+KtVAcGT CWWJ4ACpPJSb8dT5On X-Google-Smtp-Source: ABdhPJzNhUsNqrseRaM6mpMORVbqZNp6vX0Ksb6MrzPEPVJCdTugeKkkaZ+/eQcF2eWdkERNUIKrx/reZbrC X-Received: by 2002:a05:6000:18c:: with SMTP id p12mr15244543wrx.7.1610360848892; Mon, 11 Jan 2021 02:27:28 -0800 (PST) Received: from mta1.parkeon.com ([185.149.63.251]) by smtp-relay.gmail.com with ESMTPS id w129sm255626wmb.43.2021.01.11.02.27.28 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Jan 2021 02:27:28 -0800 (PST) X-Relaying-Domain: flowbird.group Received: from [172.16.14.158] (port=41910 helo=PC12445-BES.dynamic.besancon.parkeon.com) by mta1.parkeon.com with esmtp (Exim 4.71) (envelope-from ) id 1kyuQ4-0001Jc-EM; Mon, 11 Jan 2021 11:27:28 +0100 From: Martin Fuzzey To: u-boot@lists.denx.de Cc: Joe Hershberger , Wolfgang Denk , Marek Vasut , Rasmus Villemoes , Simon Glass Subject: [PATCH] env: Fix warning when forcing environment without ENV_ACCESS_IGNORE_FORCE Date: Mon, 11 Jan 2021 11:27:20 +0100 Message-Id: <1610360847-21890-1-git-send-email-martin.fuzzey@flowbird.group> X-Mailer: git-send-email 1.9.1 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.3 at phobos.denx.de X-Virus-Status: Clean Since commit 0f036bf4b87e ("env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set") a warning message is displayed when setenv -f is used WITHOUT CONFIG_ENV_ACCESS_IGNORE_FORCE, but the variable is set anyway, resulting in lots of log pollution. env_flags_validate() returns 0 if the access is accepted, or non zero if it is refused. So the original code #ifndef CONFIG_ENV_ACCESS_IGNORE_FORCE if (flag & H_FORCE) return 0; #endif was correct, it returns 0 (accepts the modification) if forced UNLESS IGNORE_FORCE is set (in which case access checks in the following code are applied). The broken patch just added a printf to the force accepted case. To obtain the intent of the patch we need this: if (flag & H_FORCE) { #ifdef CONFIG_ENV_ACCESS_IGNORE_FORCE printf("## Error: Can't force access to \"%s\"\n", name); #else return 0; #endif } Fixes: 0f036bf4b87e ("env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set") Signed-off-by: Martin Fuzzey --- env/flags.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/env/flags.c b/env/flags.c index df4aed2..e3e833c 100644 --- a/env/flags.c +++ b/env/flags.c @@ -563,12 +563,13 @@ int env_flags_validate(const struct env_entry *item, const char *newval, return 1; #endif -#ifndef CONFIG_ENV_ACCESS_IGNORE_FORCE if (flag & H_FORCE) { +#ifdef CONFIG_ENV_ACCESS_IGNORE_FORCE printf("## Error: Can't force access to \"%s\"\n", name); +#else return 0; - } #endif + } switch (op) { case env_op_delete: if (item->flags & ENV_FLAGS_VARACCESS_PREVENT_DELETE) {