[v2,08/13] env: Early return from env_get_f() on NULL name

Message ID	20211013154557.28479-9-kabel@kernel.org
State	Superseded
Delegated to:	Simon Glass
Headers	show Return-Path: <u-boot-bounces@lists.denx.de> From: =?utf-8?q?Marek_Beh=C3=BAn?= <kabel@kernel.org> To: Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com> Cc: U-Boot Mailing List <u-boot@lists.denx.de>, =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz> Subject: [PATCH v2 08/13] env: Early return from env_get_f() on NULL name Date: Wed, 13 Oct 2021 17:45:52 +0200 Message-Id: <20211013154557.28479-9-kabel@kernel.org> In-Reply-To: <20211013154557.28479-1-kabel@kernel.org> References: <20211013154557.28479-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
Series	env_get_char() removal and env_get_f() refactor \| expand [v2,00/13] env_get_char() removal and env_get_f() refactor [v2,01/13] env: Fix documentation for env_get_f() [v2,02/13] env: Drop env_get_char_spec() and old, unused .get_char() implementations [v2,03/13] examples: api: glue: Remove comment that does not apply anymore [v2,04/13] env: Change env_match() to static and remove from header [v2,05/13] env: Don't match empty variable name in env_match() [v2,06/13] env: Check for terminating null-byte in env_match() [v2,07/13] env: Inline env_get_char() into it's only user [v2,08/13] env: Early return from env_get_f() on NULL name [v2,09/13] env: Use string pointer instead of indexes in env_get_f() [v2,10/13] env: Use better name for variable in env_get_f() [v2,11/13] env: Make return value of env_get_f() behave like sprintf() on success [v2,12/13] env: Use memcpy() instead of ad-hoc code to copy variable value [v2,13/13] env: Move non-cmd specific env functions to env/common.c

Message ID

20211013154557.28479-9-kabel@kernel.org

State

Superseded

Delegated to:

Simon Glass

Headers

From: =?utf-8?q?Marek_Beh=C3=BAn?= <kabel@kernel.org>
To: Simon Glass <sjg@chromium.org>,
	Tom Rini <trini@konsulko.com>
Cc: U-Boot Mailing List <u-boot@lists.denx.de>,
 =?utf-8?q?Marek_Beh=C3=BAn?= <marek.behun@nic.cz>
Subject: [PATCH v2 08/13] env: Early return from env_get_f() on NULL name
Date: Wed, 13 Oct 2021 17:45:52 +0200
Message-Id: <20211013154557.28479-9-kabel@kernel.org>
In-Reply-To: <20211013154557.28479-1-kabel@kernel.org>
References: <20211013154557.28479-1-kabel@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: u-boot-bounces@lists.denx.de
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

Series

env_get_char() removal and env_get_f() refactor | expand

From: Marek Behún <marek.behun@nic.cz> Test non-NULL name immediately, not in env_match(). Signed-off-by: Marek Behún <marek.behun@nic.cz> --- cmd/nvedit.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Simon Glass Oct. 14, 2021, 3:11 p.m. UTC | #1

On Wed, 13 Oct 2021 at 09:46, Marek Behún <kabel@kernel.org> wrote:
>
> From: Marek Behún <marek.behun@nic.cz>
>
> Test non-NULL name immediately, not in env_match().
>
> Signed-off-by: Marek Behún <marek.behun@nic.cz>
> ---
>  cmd/nvedit.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 9f0caceadf..7c99a693ea 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -708,13 +708,11 @@  char *from_env(const char *envvar)
 
 static int env_match(const char *env, const char *s1, int i2)
 {
-	if (s1 == NULL || *s1 == '\0')
-		return -1;
-
 	while (*s1 == env[i2++] && *s1 != '\0')
 		if (*s1++ == '=')
 			return i2;
 
+	/* We can look at env[i2-1] because i2 was incremented at least once. */
 	if (*s1 == '\0' && env[i2-1] == '=')
 		return i2;
 
@@ -729,6 +727,9 @@  int env_get_f(const char *name, char *buf, unsigned len)
 	const char *env;
 	int i, nxt;
 
+	if (name == NULL || *name == '\0')
+		return -1;
+
 	if (gd->env_valid == ENV_INVALID)
 		env = (const char *)default_environment;
 	else

[v2,08/13] env: Early return from env_get_f() on NULL name

Commit Message

Comments

Patch