VNFs: Fixing klocwork issue in VNFs code

JIRA: SAMPLEVNF-83

This patch fixes the klocwork reported issues

Change-Id: I190d024777be1bf53cdc97feca1e5934781f3582
Signed-off-by: Anand B Jyoti <anand.b.jyoti@intel.com>

1 files changed, 64 insertions, 2 deletions

diff --git a/VNFs/vCGNAPT/init.c b/VNFs/vCGNAPT/init.c
index d61e419c..2716f751 100644
--- a/VNFs/vCGNAPT/init.c
+++ b/VNFs/vCGNAPT/init.c
@@ -98,14 +98,20 @@ app_init_eal(struct app_params *app)
 	uint32_t i;
 	int status;
 
+	if (unlikely (n_args >= APP_EAL_ARGC))
+		goto error_exit;
 	app->eal_argv[n_args++] = strdup(app->app_name);
 
 	app_core_build_core_mask_string(app, core_mask_str);
 	snprintf(buffer, sizeof(buffer), "-c%s", core_mask_str);
+	if (unlikely (n_args >= APP_EAL_ARGC))
+		goto error_exit;
 	app->eal_argv[n_args++] = strdup(buffer);
 
 	if (p->coremap) {
 		snprintf(buffer, sizeof(buffer), "--lcores=%s", p->coremap);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
@@ -114,19 +120,27 @@ app_init_eal(struct app_params *app)
 			sizeof(buffer),
 			"--master-lcore=%" PRIu32,
 			p->master_lcore);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	snprintf(buffer, sizeof(buffer), "-n%" PRIu32, p->channels);
+	if (unlikely (n_args >= APP_EAL_ARGC))
+		goto error_exit;
 	app->eal_argv[n_args++] = strdup(buffer);
 
 	if (p->memory_present) {
 		snprintf(buffer, sizeof(buffer), "-m%" PRIu32, p->memory);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if (p->ranks_present) {
 		snprintf(buffer, sizeof(buffer), "-r%" PRIu32, p->ranks);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
@@ -138,6 +152,8 @@ app_init_eal(struct app_params *app)
 			sizeof(buffer),
 			"--pci-blacklist=%s",
 			p->pci_blacklist[i]);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
@@ -150,8 +166,10 @@ app_init_eal(struct app_params *app)
 				sizeof(buffer),
 				"--pci-whitelist=%s",
 				p->pci_whitelist[i]);
+			if (unlikely (n_args >= APP_EAL_ARGC))
+				goto error_exit;
 			if (n_args < 255)
-			app->eal_argv[n_args++] = strdup(buffer);
+				app->eal_argv[n_args++] = strdup(buffer);
 		}
 	else
 		for (i = 0; i < app->n_links; i++) {
@@ -161,6 +179,8 @@ app_init_eal(struct app_params *app)
 				sizeof(buffer),
 				"--pci-whitelist=%s",
 				pci_bdf);
+			if (unlikely (n_args >= APP_EAL_ARGC))
+				goto error_exit;
 			app->eal_argv[n_args++] = strdup(buffer);
 		}
 
@@ -172,11 +192,15 @@ app_init_eal(struct app_params *app)
 			sizeof(buffer),
 			"--vdev=%s",
 			p->vdev[i]);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if ((p->vmware_tsc_map_present) && p->vmware_tsc_map) {
 		snprintf(buffer, sizeof(buffer), "--vmware-tsc-map");
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
@@ -185,11 +209,15 @@ app_init_eal(struct app_params *app)
 			sizeof(buffer),
 			"--proc-type=%s",
 			p->proc_type);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if (p->syslog) {
 		snprintf(buffer, sizeof(buffer), "--syslog=%s", p->syslog);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
@@ -198,41 +226,57 @@ app_init_eal(struct app_params *app)
 			sizeof(buffer),
 			"--log-level=%" PRIu32,
 			p->log_level);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if ((p->version_present) && p->version) {
 		snprintf(buffer, sizeof(buffer), "-v");
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if ((p->help_present) && p->help) {
 		snprintf(buffer, sizeof(buffer), "--help");
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if ((p->no_huge_present) && p->no_huge) {
 		snprintf(buffer, sizeof(buffer), "--no-huge");
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if ((p->no_pci_present) && p->no_pci) {
 		snprintf(buffer, sizeof(buffer), "--no-pci");
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if ((p->no_hpet_present) && p->no_hpet) {
 		snprintf(buffer, sizeof(buffer), "--no-hpet");
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if ((p->no_shconf_present) && p->no_shconf) {
 		snprintf(buffer, sizeof(buffer), "--no-shconf");
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if (p->add_driver) {
 		snprintf(buffer, sizeof(buffer), "-d=%s", p->add_driver);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
@@ -241,11 +285,15 @@ app_init_eal(struct app_params *app)
 			sizeof(buffer),
 			"--socket-mem=%s",
 			p->socket_mem);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if (p->huge_dir) {
 		snprintf(buffer, sizeof(buffer), "--huge-dir=%s", p->huge_dir);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
@@ -254,6 +302,8 @@ app_init_eal(struct app_params *app)
 			sizeof(buffer),
 			"--file-prefix=%s",
 			p->file_prefix);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
@@ -262,11 +312,15 @@ app_init_eal(struct app_params *app)
 			sizeof(buffer),
 			"--base-virtaddr=%s",
 			p->base_virtaddr);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if ((p->create_uio_dev_present) && p->create_uio_dev) {
 		snprintf(buffer, sizeof(buffer), "--create-uio-dev");
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
@@ -275,15 +329,21 @@ app_init_eal(struct app_params *app)
 			sizeof(buffer),
 			"--vfio-intr=%s",
 			p->vfio_intr);
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	if ((p->xen_dom0_present) && (p->xen_dom0)) {
 		snprintf(buffer, sizeof(buffer), "--xen-dom0");
+		if (unlikely (n_args >= APP_EAL_ARGC))
+			goto error_exit;
 		app->eal_argv[n_args++] = strdup(buffer);
 	}
 
 	snprintf(buffer, sizeof(buffer), "--");
+	if (unlikely (n_args >= APP_EAL_ARGC))
+		goto error_exit;
 	app->eal_argv[n_args++] = strdup(buffer);
 
 	app->eal_argc = n_args;
@@ -299,8 +359,10 @@ app_init_eal(struct app_params *app)
 	}
 
 	status = rte_eal_init(app->eal_argc, app->eal_argv);
-	if (status < 0)
+	if (status < 0) {
+error_exit:
 		rte_panic("EAL init error\n");
+	}
 }
 #if 0
 static void