Commit d4e565b4 authored by Paul Luse's avatar Paul Luse Committed by Jim Harris
Browse files

blobcli: fix bugs where freed memory is not NULL 



There are a few places where we check for a NULL * to make
decisions and in both shell and script modes, any command
sequence loads and unloads the bs (self contained) so when
multiple actions are taken and some value that was freed
isn't NULL we can end up with segfaults.

Change-Id: I595797266b4a25dd8bc83fdaf68cb50c11bc958b
Signed-off-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/382902


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent cbe9216e

examples/blob/cli/blobcli.c

+4 −2
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ cli_cleanup(struct cli_context_t *cli_context) 


		for (i = 0; i <= g_script.max_index; i++) {

			free(g_script.cmdline[i]);

			g_script.cmdline[i] = NULL;

		}

	}

	free(cli_context);
@@ -228,7 +227,8 @@ unload_complete(void *cb_arg, int bserrno) 
	    cli_context->action == CLI_SHELL_EXIT) {

		spdk_app_stop(cli_context->rc);

	} else {

		/* when action is NONE, we know we need to remain in the shell */

		/* when action is CLI_NONE, we know we need to remain in the shell */

		cli_context->bs = NULL;

		cli_context->action = CLI_NONE;

		cli_start(cli_context, NULL);

	}
@@ -248,6 +248,7 @@ unload_bs(struct cli_context_t *cli_context, char *msg, int bserrno) 
	if (cli_context->bs) {

		if (cli_context->channel) {

			spdk_bs_free_io_channel(cli_context->channel);

			cli_context->channel = NULL;

		}

		spdk_bs_unload(cli_context->bs, unload_complete, cli_context);

	} else {
@@ -1293,6 +1294,7 @@ cli_shell(void *arg1, void *arg2) 
	/* free strdup mem & reset arg count for next shell interaction */

	for (i = start_idx; i < cli_context->argc; i++) {

		free(cli_context->argv[i]);

		cli_context->argv[i] = NULL;

	}

	cli_context->argc = 1;