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

lib/blob: check return value after malloc() and strdup()

Browse Source 
Signed-off-by: Yan Wang <wangyan122@huawei.com>
Change-Id: Ieaaecfd12ddf7826c2e4ce6dc5f47411e7e077da
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2907
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
This commit is contained in:
Yan Wang 2020-06-09 15:02:31 +08:00 committed by Tomasz Zawadzki
parent 1befc43b2d
commit abeae98424
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/blob/blobstore.c
View File

@ -7111,6 +7111,7 @@ blob_set_xattr(struct spdk_blob *blob, const char *name, const void *value,
struct spdk_xattr_tailq *xattrs; struct spdk_xattr_tailq *xattrs;
struct spdk_xattr *xattr; struct spdk_xattr *xattr;
size_t desc_size; size_t desc_size;
void *tmp;
blob_verify_md_op(blob); blob_verify_md_op(blob);
@ -7134,9 +7135,14 @@ blob_set_xattr(struct spdk_blob *blob, const char *name, const void *value,
TAILQ_FOREACH(xattr, xattrs, link) { TAILQ_FOREACH(xattr, xattrs, link) {
if (!strcmp(name, xattr->name)) { if (!strcmp(name, xattr->name)) {
tmp = malloc(value_len);
if (!tmp) {
return -ENOMEM;
}
free(xattr->value); free(xattr->value);
xattr->value_len = value_len; xattr->value_len = value_len;
xattr->value = malloc(value_len); xattr->value = tmp;
memcpy(xattr->value, value, value_len); memcpy(xattr->value, value, value_len);
blob->state = SPDK_BLOB_STATE_DIRTY; blob->state = SPDK_BLOB_STATE_DIRTY;
@ -7149,9 +7155,20 @@ blob_set_xattr(struct spdk_blob *blob, const char *name, const void *value,
if (!xattr) { if (!xattr) {
return -ENOMEM; return -ENOMEM;
} }
xattr->name = strdup(name); xattr->name = strdup(name);
if (!xattr->name) {
free(xattr);
return -ENOMEM;
}
xattr->value_len = value_len; xattr->value_len = value_len;
xattr->value = malloc(value_len); xattr->value = malloc(value_len);
if (!xattr->value) {
free(xattr->name);
free(xattr);
return -ENOMEM;
}
memcpy(xattr->value, value, value_len); memcpy(xattr->value, value, value_len);
TAILQ_INSERT_TAIL(xattrs, xattr, link); TAILQ_INSERT_TAIL(xattrs, xattr, link);