From patchwork Thu Aug 27 09:43:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Kiernan X-Patchwork-Id: 1352465 X-Patchwork-Delegate: marek.vasut@gmail.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=85.214.62.61; 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Z6zyvRQi; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Bcd935Gfbz9sRK for ; Thu, 27 Aug 2020 19:44:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C07B2821DE; Thu, 27 Aug 2020 11:44:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="Z6zyvRQi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D359981260; Thu, 27 Aug 2020 11:43:58 +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=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (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 6DEF581260 for ; Thu, 27 Aug 2020 11:43:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alex.kiernan@gmail.com Received: by mail-wr1-x441.google.com with SMTP id r15so4689567wrp.13 for ; Thu, 27 Aug 2020 02:43:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=JF94p0SLgnx1rwqMP3Vp4VPkDD18G9hALQAb51+sDbg=; b=Z6zyvRQivzu8Ua8VLCXHQHWKwGu3Ik4qL8EoJer2IgFxFa7nZtoLm+41Z9qCGPC96v 1z1A0qUs37s5l409VzbQDq45qwzH+YzEoI+cnM36xOCoQ31ntGL2heW5rYdurYSjhk+h /BaoMVuTtmI5l1gCBfNU9D1vEiC/aFQrC6ZlcwzNSYs5wUNxlrvmbLfdvq4DPw/5hkYn ig3fQ8rrTOfMIu34ZfdQ+8GGb5FnAEyNuWhXp3tlT9ilMCkyMAaY5Y6Qtwk8bPl15i9J XxnI5ZJW5lflELkB/SB5wbTtXu/zZV9Ocnq8tAa9NdKUbwSGX5kr4kFCVYbraAOp6z8Y jfAQ== 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=JF94p0SLgnx1rwqMP3Vp4VPkDD18G9hALQAb51+sDbg=; b=eR7x8+2AngYzaCkPXiZHtzHS0vJ/Rjsa0yYHpLn3mhOykvIvxQo8TypyiyPnvdKRnF 4/5br1rFYZIGYsofhnqh9JeUNMuTYHQGSmdyi3EgFSSeR+jvQOmKcrdDubUbObjoun0V PI70bZyPArr8+N46usArQ4R/VQSViZk8XeaE53ynvzU/sa9ttRtrtBPTbKyZhrbRyPlX XoW63gXdPy9NUCdaebwvVEERwWL6ooUFxrKOr4KFgvGGRU/lepmMmHEOOiGiWlLGY3SH QzLZ8HTrHhugqMP+Qeur47TY8V9z/KJQpBpt700mvnt2Sc3mGbXHicih9CqcDr9TsABp s8Lg== X-Gm-Message-State: AOAM5308GYZL9Z10h3MXJSyfM4A9hsi0l9jRoz7hUybvxIJA1uQuQ2XT 3KcvrV2sS0fD88qOfy55/jYBdI9I7Zo= X-Google-Smtp-Source: ABdhPJyVp7AXrQcms/w4dcWwXzMWpgwlr0FyxQLqhBfbCpWF38UOQk/+VvQrqaILxDpu1bTGg6R5iQ== X-Received: by 2002:a5d:4a41:: with SMTP id v1mr21166847wrs.371.1598521435733; Thu, 27 Aug 2020 02:43:55 -0700 (PDT) Received: from ip-172-31-20-103.eu-west-1.compute.internal (ec2-54-76-105-136.eu-west-1.compute.amazonaws.com. [54.76.105.136]) by smtp.gmail.com with ESMTPSA id a11sm4973259wrq.0.2020.08.27.02.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 02:43:55 -0700 (PDT) From: Alex Kiernan To: u-boot@lists.denx.de Cc: Marek Vasut , Alex Kiernan , Joe Hershberger , Wolfgang Denk Subject: [PATCH] Revert "env: Warn on force access if ENV_ACCESS_IGNORE_FORCE set" Date: Thu, 27 Aug 2020 09:43:42 +0000 Message-Id: <20200827094342.25780-1-alex.kiernan@gmail.com> X-Mailer: git-send-email 2.17.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 This reverts commit 0f036bf4b87e6416f5c4d23865a62a62d9073c20. With this change applied and CONFIG_ENV_ACCESS_IGNORE_FORCE disabled, the warning appears on every force overwrite, but the variable is then written to: => env print ethaddr ethaddr=00:1C:2B:08:AF:65 => env set ethaddr 00:00:00:00:00:00 ## Error: Can't overwrite "ethaddr" ## Error inserting "ethaddr" variable, errno=1 => env print ethaddr ethaddr=00:1C:2B:08:AF:65 => env set -f ethaddr 00:00:00:00:00:00 ## Error: Can't force access to "ethaddr" => env print ethaddr ethaddr=00:00:00:00:00:00 Signed-off-by: Alex Kiernan --- As I noted in my email, I can't see an immediately obvious way to make this work as intended and given we're at -rc3, I think a revert is the most appropriate way forward. env/flags.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/env/flags.c b/env/flags.c index df4aed26b2c6..4a73c31670f4 100644 --- a/env/flags.c +++ b/env/flags.c @@ -564,10 +564,8 @@ int env_flags_validate(const struct env_entry *item, const char *newval, #endif #ifndef CONFIG_ENV_ACCESS_IGNORE_FORCE - if (flag & H_FORCE) { - printf("## Error: Can't force access to \"%s\"\n", name); + if (flag & H_FORCE) return 0; - } #endif switch (op) { case env_op_delete: