Commit f69235bf authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Darek Stojaczyk
Browse files

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



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: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/c/441641


Reviewed-by: default avatarwuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 26e6b505

lib/event/app.c

+17 −10
Original line number Diff line number Diff line
@@ -782,6 +782,7 @@ spdk_app_parse_args(int argc, char **argv, struct spdk_app_opts *opts, 
	struct option *cmdline_options;

	char *cmdline_short_opts = NULL;

	enum spdk_app_parse_args_rvals retval = SPDK_APP_PARSE_ARGS_FAIL;

	long int tmp;



	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;

			goto out;

		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;

			}

			opts->shm_id = atoi(optarg);

			break;

		case CPUMASK_OPT_IDX:

			opts->reactor_mask = optarg;

			break;

		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;

			}

			opts->mem_channel = atoi(optarg);

			break;

		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;

			}

			opts->master_core = atoi(optarg);

			break;

		case SILENCE_NOTICELOG_OPT_IDX:

			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;

			break;

		case NUM_TRACE_ENTRIES_OPT_IDX:

			opts->num_entries = strtoull(optarg, NULL, 0);

			if (opts->num_entries == ULLONG_MAX || opts->num_entries == 0) {

			tmp = spdk_strtoll(optarg, 0);

			if (tmp <= 0) {

				fprintf(stderr, "Invalid num_entries %s\n", optarg);

				usage(app_usage);

				goto out;

			}

			opts->num_entries = (uint64_t)tmp;

			break;

		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;

			}

			opts->max_delay_us = atoi(optarg);

			opts->max_delay_us = (uint64_t)tmp;

			break;

		case '?':

			/*