From patchwork Thu Nov 26 10:52:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Fenkart X-Patchwork-Id: 549007 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CED361402C4 for ; Thu, 26 Nov 2015 22:01:50 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=tau0EUzH; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3276A4B98A; Thu, 26 Nov 2015 12:01:46 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SBCWKeoYBV9q; Thu, 26 Nov 2015 12:01:46 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D83904B96A; Thu, 26 Nov 2015 12:01:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4D7EA4B90E for ; Thu, 26 Nov 2015 11:52:44 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J0fne9jHkk15 for ; Thu, 26 Nov 2015 11:52:44 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by theia.denx.de (Postfix) with ESMTPS id 139E74B90A for ; Thu, 26 Nov 2015 11:52:40 +0100 (CET) Received: by wmec201 with SMTP id c201so17212584wme.1 for ; Thu, 26 Nov 2015 02:52:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xB7dqXNLtuxbO0z+xew3ftuR6lRWlrQh8sSzo0zT35s=; b=tau0EUzHBgKUoEXX9AnkuOZeEwYxeiP4s5EvKBIQH928EFQ4hlcG+LXOQa9r5FRbyO ICRQMQb4M9zvU77RmilijPnGKnT90BCvZ2qb4evO5GSzt9kDalCJhZfMCUlENBw7tMsK Y+fXzPM7VIa5gHMP2ODp7Gbb3pL0IUDrwo6nlnLgnm3OK0BE2gUpwu6j7IhzbwauoGam AAbkfrJnUxhGPgdlMCPXVod6VAxSZbelLODfvRwvzdt79NiSK++zht/2bgLaw4D3ushj /fBfT220t9yDiNalwTBuQjxyoL8bZqfTiblBYYv+CjZ7HprsRF+3E07U6u/cbA1ddFHZ EOVA== X-Received: by 10.28.64.7 with SMTP id n7mr3009417wma.30.1448535160350; Thu, 26 Nov 2015 02:52:40 -0800 (PST) Received: from localhost (ip-89-176-167-254.net.upcbroadband.cz. [89.176.167.254]) by smtp.gmail.com with ESMTPSA id t194sm2122335wmt.11.2015.11.26.02.52.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2015 02:52:39 -0800 (PST) From: Andreas Fenkart X-Google-Original-From: Andreas Fenkart To: u-boot@lists.denx.de Date: Thu, 26 Nov 2015 11:52:28 +0100 Message-Id: <1448535154-6350-2-git-send-email-andreas.fenkart@dev.digitalstrom.org> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1448535154-6350-1-git-send-email-andreas.fenkart@dev.digitalstrom.org> References: <1448535154-6350-1-git-send-email-andreas.fenkart@dev.digitalstrom.org> X-Mailman-Approved-At: Thu, 26 Nov 2015 12:01:36 +0100 Subject: [U-Boot] [PATCH v2 1/7] tools: env validate: pass values as 0-based array X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" passing argv/argc can produce off-by-one errors Signed-off-by: Andreas Fenkart --- common/env_flags.c | 14 +++++++------- include/env_flags.h | 2 +- tools/env/fw_env.c | 11 +++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/common/env_flags.c b/common/env_flags.c index e682d85..529e371 100644 --- a/common/env_flags.c +++ b/common/env_flags.c @@ -373,21 +373,21 @@ int env_flags_validate_varaccess(const char *name, int check_mask) /* * Validate the parameters to "env set" directly */ -int env_flags_validate_env_set_params(int argc, char * const argv[]) +int env_flags_validate_env_set_params(char *name, char * const val[], int count) { - if ((argc >= 3) && argv[2] != NULL) { - enum env_flags_vartype type = env_flags_get_type(argv[1]); + if ((count >= 1) && val[0] != NULL) { + enum env_flags_vartype type = env_flags_get_type(name); /* * we don't currently check types that need more than * one argument */ - if (type != env_flags_vartype_string && argc > 3) { - printf("## Error: too many parameters for setting " - "\"%s\"\n", argv[1]); + if (type != env_flags_vartype_string && count > 1) { + printf("## Error: too many parameters for setting \"%s\"\n", + name); return -1; } - return env_flags_validate_type(argv[1], argv[2]); + return env_flags_validate_type(name, val[0]); } /* ok */ return 0; diff --git a/include/env_flags.h b/include/env_flags.h index 8823fb9..9e87e1b 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -143,7 +143,7 @@ int env_flags_validate_varaccess(const char *name, int check_mask); /* * Validate the parameters passed to "env set" for type compliance */ -int env_flags_validate_env_set_params(int argc, char * const argv[]); +int env_flags_validate_env_set_params(char *name, char *const val[], int count); #else /* !USE_HOSTCC */ diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index ba11f77..22507f6 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -497,8 +497,9 @@ int fw_setenv(int argc, char *argv[]) { int i, rc; size_t len; - char *name; + char *name, **valv; char *value = NULL; + int valc; #ifdef CONFIG_FILE if (argc >= 2 && strcmp(argv[1], "-c") == 0) { @@ -542,13 +543,15 @@ int fw_setenv(int argc, char *argv[]) } name = argv[1]; + valv = argv + 2; + valc = argc - 2; - if (env_flags_validate_env_set_params(argc, argv) < 0) + if (env_flags_validate_env_set_params(name, valv, valc) < 0) return 1; len = 0; - for (i = 2; i < argc; ++i) { - char *val = argv[i]; + for (i = 0; i < valc; ++i) { + char *val = valv[i]; size_t val_len = strlen(val); if (value)