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

lvol: check spdk_lvol for NULL before dereferencing it

Browse Source 
Change-Id: I0f01e2ccde06fa0a5a4ff31f106381bbf3ae6020
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/433858
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Tomasz Zawadzki 2018-11-19 08:39:16 -05:00 committed by Jim Harris
parent f425b98513
commit 6bba6fe9b5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/lvol/lvol.c
View File

@ -1425,8 +1425,7 @@ void
spdk_lvol_inflate(struct spdk_lvol *lvol, spdk_lvol_op_complete cb_fn, void *cb_arg) spdk_lvol_inflate(struct spdk_lvol *lvol, spdk_lvol_op_complete cb_fn, void *cb_arg)
{ {
struct spdk_lvol_req *req; struct spdk_lvol_req *req;
struct spdk_blob *blob = lvol->blob; spdk_blob_id blob_id;
spdk_blob_id blob_id = spdk_blob_get_id(blob);
assert(cb_fn != NULL); assert(cb_fn != NULL);
@ -1453,6 +1452,7 @@ spdk_lvol_inflate(struct spdk_lvol *lvol, spdk_lvol_op_complete cb_fn, void *cb_
return; return;
} }
blob_id = spdk_blob_get_id(lvol->blob);
spdk_bs_inflate_blob(lvol->lvol_store->blobstore, req->channel, blob_id, _spdk_lvol_inflate_cb, spdk_bs_inflate_blob(lvol->lvol_store->blobstore, req->channel, blob_id, _spdk_lvol_inflate_cb,
req); req);
} }
@ -1461,8 +1461,7 @@ void
spdk_lvol_decouple_parent(struct spdk_lvol *lvol, spdk_lvol_op_complete cb_fn, void *cb_arg) spdk_lvol_decouple_parent(struct spdk_lvol *lvol, spdk_lvol_op_complete cb_fn, void *cb_arg)
{ {
struct spdk_lvol_req *req; struct spdk_lvol_req *req;
struct spdk_blob *blob = lvol->blob; spdk_blob_id blob_id;
spdk_blob_id blob_id = spdk_blob_get_id(blob);
assert(cb_fn != NULL); assert(cb_fn != NULL);
@ -1489,6 +1488,7 @@ spdk_lvol_decouple_parent(struct spdk_lvol *lvol, spdk_lvol_op_complete cb_fn, v
return; return;
} }
blob_id = spdk_blob_get_id(lvol->blob);
spdk_bs_blob_decouple_parent(lvol->lvol_store->blobstore, req->channel, blob_id, spdk_bs_blob_decouple_parent(lvol->lvol_store->blobstore, req->channel, blob_id,
_spdk_lvol_inflate_cb, req); _spdk_lvol_inflate_cb, req);
} }