From 2bbc59fa79e4873322629dd65017ebcd53d924cf Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Tue, 23 Jan 2018 14:30:40 -0700 Subject: [PATCH] nvmf: Fix bug when accessing realloc'd pointer Caught by the latest scan-build. Change-Id: I606a30447e5221c86e79accb9a2c1fe76e9eeee0 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/396054 Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris --- lib/nvmf/nvmf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index b90a92d6f..d780953fe 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -570,26 +570,20 @@ int spdk_nvmf_poll_group_resume_subsystem(struct spdk_nvmf_poll_group *group, struct spdk_nvmf_subsystem *subsystem) { - struct spdk_nvmf_subsystem_poll_group *sgroup; int rc; if (subsystem->id >= group->num_sgroups) { return -1; } - sgroup = &group->sgroups[subsystem->id]; - if (sgroup == NULL) { - return -1; - } - - assert(sgroup->state == SPDK_NVMF_SUBSYSTEM_PAUSED); + assert(group->sgroups[subsystem->id].state == SPDK_NVMF_SUBSYSTEM_PAUSED); rc = poll_group_update_subsystem(group, subsystem); if (rc) { return rc; } - sgroup->state = SPDK_NVMF_SUBSYSTEM_ACTIVE; + group->sgroups[subsystem->id].state = SPDK_NVMF_SUBSYSTEM_ACTIVE; return 0; }