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

bdev/error: Fix free resource when vbdev_error_init() failed

Browse Source 
Change-Id: I38d6b644f5dc2877c0e9834c7551b1de935e4239
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/404324
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-03-21 10:09:41 +09:00 committed by Daniel Verkamp
parent 764616bc47
commit 783851334d
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/bdev/error/vbdev_error.c
View File

@ -294,13 +294,25 @@ spdk_vbdev_error_create(struct spdk_bdev *base_bdev)
return 0; return 0;
} }
static void
vbdev_error_clear_config(void)
{
struct spdk_vbdev_error_config *cfg;
while ((cfg = TAILQ_FIRST(&g_error_config))) {
TAILQ_REMOVE(&g_error_config, cfg, tailq);
free(cfg->base_bdev);
free(cfg);
}
}
static int static int
vbdev_error_init(void) vbdev_error_init(void)
{ {
struct spdk_conf_section *sp; struct spdk_conf_section *sp;
struct spdk_vbdev_error_config *cfg; struct spdk_vbdev_error_config *cfg;
const char *base_bdev_name; const char *base_bdev_name;
int i; int i, rc;
sp = spdk_conf_find_section(NULL, "BdevError"); sp = spdk_conf_find_section(NULL, "BdevError");
if (sp == NULL) { if (sp == NULL) {
@ -315,38 +327,39 @@ vbdev_error_init(void)
base_bdev_name = spdk_conf_section_get_nmval(sp, "BdevError", i, 0); base_bdev_name = spdk_conf_section_get_nmval(sp, "BdevError", i, 0);
if (!base_bdev_name) { if (!base_bdev_name) {
SPDK_ERRLOG("ErrorInjection configuration missing bdev name\n"); SPDK_ERRLOG("ErrorInjection configuration missing bdev name\n");
return -EINVAL; rc = -EINVAL;
goto error;
} }
cfg = calloc(1, sizeof(*cfg)); cfg = calloc(1, sizeof(*cfg));
if (!cfg) { if (!cfg) {
SPDK_ERRLOG("calloc() failed for vbdev_error_config\n"); SPDK_ERRLOG("calloc() failed for vbdev_error_config\n");
return -ENOMEM; rc = -ENOMEM;
goto error;
} }
cfg->base_bdev = strdup(base_bdev_name); cfg->base_bdev = strdup(base_bdev_name);
if (!cfg->base_bdev) { if (!cfg->base_bdev) {
free(cfg); free(cfg);
SPDK_ERRLOG("strdup() failed for bdev name\n"); SPDK_ERRLOG("strdup() failed for bdev name\n");
return -ENOMEM; rc = -ENOMEM;
goto error;
} }
TAILQ_INSERT_TAIL(&g_error_config, cfg, tailq); TAILQ_INSERT_TAIL(&g_error_config, cfg, tailq);
} }
return 0; return 0;
error:
vbdev_error_clear_config();
return rc;
} }
static void static void
vbdev_error_fini(void) vbdev_error_fini(void)
{ {
struct spdk_vbdev_error_config *cfg; vbdev_error_clear_config();
while ((cfg = TAILQ_FIRST(&g_error_config))) {
TAILQ_REMOVE(&g_error_config, cfg, tailq);
free(cfg->base_bdev);
free(cfg);
}
} }
static void static void