From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B9DDC433EF for ; Tue, 12 Oct 2021 11:06:49 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 04C3860E78 for ; Tue, 12 Oct 2021 11:06:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 04C3860E78 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4968383729; Tue, 12 Oct 2021 13:06:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org 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=kernel.org header.i=@kernel.org header.b="W922yASg"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DBCD48371D; Tue, 12 Oct 2021 13:05:24 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AC1E783740 for ; Tue, 12 Oct 2021 13:05:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 8E93461050; Tue, 12 Oct 2021 11:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634036714; bh=cky1QspYIapjWTOLswV3fs9322UTDETbmGy1FhjaqAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W922yASgUSti/pgbhS1hD14uy9WQDlMCQTlnksYrBRtBIkGL313xwutg7XbM7CLEd rXfGVyj9s5NPTth0x5fwJ3m4B6D1KLl9VShhyf6pzYPUTr9DCF3SOqf5lBPxkoHBfZ pUWzwsxp4McoWnHhL9kvthrFtv/vDLjqFNbvkhRV4m3Qwwdz6dm/YWCgmH5lDBQ2c6 JDmCxIxk9KDKrUuzq5QU84u3JsX4s8EoROHXl0dfJmqNfq9zDDvj5lcsIWyK3qxm+R MmJ+/kly8PVaxGSxer58bSqjkesW/3YbvtdMmf8vu8S4tryN3b4B+Av1NZWNhygGDt VQLCB04w4CSlg== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Simon Glass , Tom Rini Cc: U-Boot Mailing List , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 07/10] env: Early return from env_get_f() on NULL name Date: Tue, 12 Oct 2021 13:04:58 +0200 Message-Id: <20211012110501.6118-8-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211012110501.6118-1-kabel@kernel.org> References: <20211012110501.6118-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún Test non-NULL name immediately, not in env_match(). Signed-off-by: Marek Behún --- cmd/nvedit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 4664b7b872..412918a000 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -708,9 +708,6 @@ 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 != '\0' && *s1 == env[i2++]) if (*s1++ == '=') return i2; @@ -729,6 +726,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 -- 2.32.0