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

rbd: fix the pool_name and rbd_name wild pointer issue

Browse Source 
Previously, we directly assigned the pointer of pool_name
and rbd_name, and this is not safe. After the rpc test,
we found the string value is not correct, so use strdup.

Change-Id: Ibadc57d3cb5b9869b7db5a22c2459769e92edebd
Signed-off-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
Ziye Yang 2016-10-14 19:17:54 +08:00 committed by Daniel Verkamp
parent 3b951037a4
commit 22b12b319e
1 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/bdev/rbd/blockdev_rbd.c
View File

@ -60,7 +60,7 @@ static int blockdev_rbd_count = 0;
typedef void (*rbd_cb_fn_t)(void *); typedef void (*rbd_cb_fn_t)(void *);
struct blockdev_rbd_pool_info { struct blockdev_rbd_pool_info {
const char *name; char *name;
TAILQ_ENTRY(blockdev_rbd_pool_info) tailq; TAILQ_ENTRY(blockdev_rbd_pool_info) tailq;
}; };
@ -81,7 +81,7 @@ struct blockdev_rbd_io {
struct blockdev_rbd { struct blockdev_rbd {
struct spdk_bdev disk; struct spdk_bdev disk;
const char *rbd_name; char *rbd_name;
rbd_image_info_t info; rbd_image_info_t info;
struct blockdev_rbd_pool_info *pool_info; struct blockdev_rbd_pool_info *pool_info;
uint64_t size; uint64_t size;
@ -99,6 +99,28 @@ struct blockdev_rbd_io_channel {
struct spdk_poller *poller; struct spdk_poller *poller;
}; };
static void
blockdev_rbd_free_pool_info(struct blockdev_rbd_pool_info *pool_info)
{
if (!pool_info) {
return;
}
free(pool_info->name);
free(pool_info);
}
static void
blockdev_rbd_free(struct blockdev_rbd *rbd)
{
if (!rbd) {
return;
}
free(rbd->rbd_name);
free(rbd);
}
static int static int
blockdev_rados_context_init(const char *rbd_pool_name, rados_t *cluster, blockdev_rados_context_init(const char *rbd_pool_name, rados_t *cluster,
rados_ioctx_t *io_ctx) rados_ioctx_t *io_ctx)
@ -498,12 +520,12 @@ blockdev_rbd_library_fini(void)
while (!TAILQ_EMPTY(&g_rbds)) { while (!TAILQ_EMPTY(&g_rbds)) {
rbd = TAILQ_FIRST(&g_rbds); rbd = TAILQ_FIRST(&g_rbds);
TAILQ_REMOVE(&g_rbds, rbd, tailq); TAILQ_REMOVE(&g_rbds, rbd, tailq);
free(rbd); blockdev_rbd_free(rbd);
} }
while (!TAILQ_EMPTY(&g_rbd_pools)) { while (!TAILQ_EMPTY(&g_rbd_pools)) {
pool_info = TAILQ_FIRST(&g_rbd_pools); pool_info = TAILQ_FIRST(&g_rbd_pools);
TAILQ_REMOVE(&g_rbd_pools, pool_info, tailq); TAILQ_REMOVE(&g_rbd_pools, pool_info, tailq);
free(pool_info); blockdev_rbd_free_pool_info(pool_info);
} }
} }
@ -524,7 +546,12 @@ blockdev_rbd_pool_info_init(const char *rbd_pool_name)
return NULL; return NULL;
} }
pool_info->name = rbd_pool_name; pool_info->name = strdup(rbd_pool_name);
if (!pool_info->name) {
blockdev_rbd_free_pool_info(pool_info);
return NULL;
}
TAILQ_INSERT_TAIL(&g_rbd_pools, pool_info, tailq); TAILQ_INSERT_TAIL(&g_rbd_pools, pool_info, tailq);
return pool_info; return pool_info;
@ -537,6 +564,10 @@ spdk_bdev_rbd_create(const char *pool_name, const char *rbd_name, uint32_t block
struct blockdev_rbd *rbd; struct blockdev_rbd *rbd;
int ret; int ret;
if ((pool_name == NULL) || (rbd_name == NULL)) {
return -1;
}
pool_info = blockdev_rbd_pool_info_init(pool_name); pool_info = blockdev_rbd_pool_info_init(pool_name);
if (pool_info == NULL) { if (pool_info == NULL) {
SPDK_ERRLOG("failed to create blockdev_rbd_pool_info\n"); SPDK_ERRLOG("failed to create blockdev_rbd_pool_info\n");
@ -546,16 +577,22 @@ spdk_bdev_rbd_create(const char *pool_name, const char *rbd_name, uint32_t block
rbd = calloc(1, sizeof(struct blockdev_rbd)); rbd = calloc(1, sizeof(struct blockdev_rbd));
if (rbd == NULL) { if (rbd == NULL) {
SPDK_ERRLOG("Failed to allocate blockdev_rbd struct\n"); SPDK_ERRLOG("Failed to allocate blockdev_rbd struct\n");
free(pool_info); blockdev_rbd_free_pool_info(pool_info);
return -1; return -1;
} }
rbd->pool_info = pool_info; rbd->pool_info = pool_info;
rbd->rbd_name = rbd_name; rbd->rbd_name = strdup(rbd_name);
if (!rbd->rbd_name) {
blockdev_rbd_free_pool_info(pool_info);
blockdev_rbd_free(rbd);
return -1;
}
ret = blockdev_rbd_init(pool_info->name, rbd_name, &rbd->info); ret = blockdev_rbd_init(pool_info->name, rbd_name, &rbd->info);
if (ret < 0) { if (ret < 0) {
free(pool_info); blockdev_rbd_free_pool_info(pool_info);
free(rbd); blockdev_rbd_free(rbd);
SPDK_ERRLOG("Failed to init rbd device\n"); SPDK_ERRLOG("Failed to init rbd device\n");
return -1; return -1;
} }