ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

event/app: Improve error check of input parsing by spdk_strtol

Browse Source 
For the number of trace entries, change strtoull to spdk_strtoll
because no issue will occur by the change.

Besides, getopt guarantees that if an argument is followed by a
semicolon, optstring of it is not NULL. spdk_app_parse_args()
had unnecessary NULL pointer check related with this. Hence
remove those NULL pointer checks too.

Change-Id: I33d0328205d1765f70f70fc734d0d8b4165fef5e
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/441641
Reviewed-by: wuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-01-29 12:05:40 +09:00 committed by Darek Stojaczyk
parent 26e6b505a5
commit f69235bf3a
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/event/app.c
View File

@ -782,6 +782,7 @@ spdk_app_parse_args(int argc, char **argv, struct spdk_app_opts *opts,
struct option *cmdline_options; struct option *cmdline_options;
char *cmdline_short_opts = NULL; char *cmdline_short_opts = NULL;
enum spdk_app_parse_args_rvals retval = SPDK_APP_PARSE_ARGS_FAIL; enum spdk_app_parse_args_rvals retval = SPDK_APP_PARSE_ARGS_FAIL;
long int tmp;
memcpy(&g_default_opts, opts, sizeof(g_default_opts)); memcpy(&g_default_opts, opts, sizeof(g_default_opts));
@ -856,25 +857,28 @@ spdk_app_parse_args(int argc, char **argv, struct spdk_app_opts *opts,
retval = SPDK_APP_PARSE_ARGS_HELP; retval = SPDK_APP_PARSE_ARGS_HELP;
goto out; goto out;
case SHM_ID_OPT_IDX: case SHM_ID_OPT_IDX:
if (optarg == NULL) { opts->shm_id = spdk_strtol(optarg, 10);
if (opts->shm_id < 0) {
fprintf(stderr, "Invalid shared memory ID %s\n", optarg);
goto out; goto out;
} }
opts->shm_id = atoi(optarg);
break; break;
case CPUMASK_OPT_IDX: case CPUMASK_OPT_IDX:
opts->reactor_mask = optarg; opts->reactor_mask = optarg;
break; break;
case MEM_CHANNELS_OPT_IDX: case MEM_CHANNELS_OPT_IDX:
if (optarg == NULL) { opts->mem_channel = spdk_strtol(optarg, 10);
if (opts->mem_channel < 0) {
fprintf(stderr, "Invalid memory channel %s\n", optarg);
goto out; goto out;
} }
opts->mem_channel = atoi(optarg);
break; break;
case MASTER_CORE_OPT_IDX: case MASTER_CORE_OPT_IDX:
if (optarg == NULL) { opts->master_core = spdk_strtol(optarg, 10);
if (opts->master_core < 0) {
fprintf(stderr, "Invalid master core %s\n", optarg);
goto out; goto out;
} }
opts->master_core = atoi(optarg);
break; break;
case SILENCE_NOTICELOG_OPT_IDX: case SILENCE_NOTICELOG_OPT_IDX:
opts->print_level = SPDK_LOG_WARN; opts->print_level = SPDK_LOG_WARN;
@ -970,18 +974,21 @@ spdk_app_parse_args(int argc, char **argv, struct spdk_app_opts *opts,
opts->hugedir = optarg; opts->hugedir = optarg;
break; break;
case NUM_TRACE_ENTRIES_OPT_IDX: case NUM_TRACE_ENTRIES_OPT_IDX:
opts->num_entries = strtoull(optarg, NULL, 0); tmp = spdk_strtoll(optarg, 0);
if (opts->num_entries == ULLONG_MAX || opts->num_entries == 0) { if (tmp <= 0) {
fprintf(stderr, "Invalid num_entries %s\n", optarg); fprintf(stderr, "Invalid num_entries %s\n", optarg);
usage(app_usage); usage(app_usage);
goto out; goto out;
} }
opts->num_entries = (uint64_t)tmp;
break; break;
case MAX_REACTOR_DELAY_OPT_IDX: case MAX_REACTOR_DELAY_OPT_IDX:
if (optarg == NULL) { tmp = spdk_strtol(optarg, 10);
if (tmp < 0) {
fprintf(stderr, "Invalid maximum latency %s\n", optarg);
goto out; goto out;
} }
opts->max_delay_us = atoi(optarg); opts->max_delay_us = (uint64_t)tmp;
break; break;
case '?': case '?':
/* /*