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

blobstore: fix potential memleak problem in blob_serialize_add_page()

Browse Source 
In blob_serialize_add_page(), *pages is set to spdk_realloc(*pages).
If spdk_realloc() returns NULL, the *pages pointer will be
overridden, whose memory will leak.

Here, we introduce a new var (tmp_pages) for checking the return
value of spdk_realloc(*pages).

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Change-Id: Ib2ead3f3b5d5e44688d1f0568816f483aa9e101f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8307
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Zhiqiang Liu 2021-06-13 19:42:14 +08:00 committed by Tomasz Zawadzki
parent c9d8421590
commit c269de97eb
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/blob/blobstore.c
View File

@ -876,27 +876,29 @@ blob_serialize_add_page(const struct spdk_blob *blob,
uint32_t *page_count, uint32_t *page_count,
struct spdk_blob_md_page **last_page) struct spdk_blob_md_page **last_page)
{ {
struct spdk_blob_md_page *page; struct spdk_blob_md_page *page, *tmp_pages;
assert(pages != NULL); assert(pages != NULL);
assert(page_count != NULL); assert(page_count != NULL);
*last_page = NULL;
if (*page_count == 0) { if (*page_count == 0) {
assert(*pages == NULL); assert(*pages == NULL);
*page_count = 1;
*pages = spdk_malloc(SPDK_BS_PAGE_SIZE, 0, *pages = spdk_malloc(SPDK_BS_PAGE_SIZE, 0,
NULL, SPDK_ENV_SOCKET_ID_ANY, SPDK_MALLOC_DMA); NULL, SPDK_ENV_SOCKET_ID_ANY, SPDK_MALLOC_DMA);
if (*pages == NULL) {
return -ENOMEM;
}
*page_count = 1;
} else { } else {
assert(*pages != NULL); assert(*pages != NULL);
(*page_count)++; tmp_pages = spdk_realloc(*pages, SPDK_BS_PAGE_SIZE * (*page_count + 1), 0);
*pages = spdk_realloc(*pages, SPDK_BS_PAGE_SIZE * (*page_count), 0); if (tmp_pages == NULL) {
}
if (*pages == NULL) {
*page_count = 0;
*last_page = NULL;
return -ENOMEM; return -ENOMEM;
} }
(*page_count)++;
*pages = tmp_pages;
}
page = &(*pages)[*page_count - 1]; page = &(*pages)[*page_count - 1];
memset(page, 0, sizeof(*page)); memset(page, 0, sizeof(*page));