V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

tools: env validate: pass values as 0-based array 

passing argv/argc can produce off-by-one errors

Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
This commit is contained in:
Andreas Fenkart 2015-12-09 13:13:21 +01:00 committed by Tom Rini
parent 57dc53a724
commit 167f525871
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/env_flags.c
View File

@ -373,21 +373,21 @@ int env_flags_validate_varaccess(const char *name, int check_mask)
/* /*
* Validate the parameters to "env set" directly * 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) { if ((count >= 1) && val[0] != NULL) {
enum env_flags_vartype type = env_flags_get_type(argv[1]); enum env_flags_vartype type = env_flags_get_type(name);
/* /*
* we don't currently check types that need more than * we don't currently check types that need more than
* one argument * one argument
*/ */
if (type != env_flags_vartype_string && argc > 3) { if (type != env_flags_vartype_string && count > 1) {
printf("## Error: too many parameters for setting " printf("## Error: too many parameters for setting \"%s\"\n",
"\"%s\"\n", argv[1]); name);
return -1; return -1;
} }
return env_flags_validate_type(argv[1], argv[2]); return env_flags_validate_type(name, val[0]);
} }
/* ok */ /* ok */
return 0; return 0;

2
include/env_flags.h
View File

@ -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 * 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 */ #else /* !USE_HOSTCC */

11
tools/env/fw_env.c vendored
View File

@ -498,8 +498,9 @@ int fw_setenv(int argc, char *argv[])
{ {
int i, rc; int i, rc;
size_t len; size_t len;
char *name; char *name, **valv;
char *value = NULL; char *value = NULL;
int valc;
#ifdef CONFIG_FILE #ifdef CONFIG_FILE
if (argc >= 2 && strcmp(argv[1], "-c") == 0) { if (argc >= 2 && strcmp(argv[1], "-c") == 0) {
@ -543,13 +544,15 @@ int fw_setenv(int argc, char *argv[])
} }
name = argv[1]; 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; return 1;
len = 0; len = 0;
for (i = 2; i < argc; ++i) { for (i = 0; i < valc; ++i) {
char *val = argv[i]; char *val = valv[i];
size_t val_len = strlen(val); size_t val_len = strlen(val);
if (value) if (value)