diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2016-12-06 16:21:41 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2016-12-07 23:38:25 -0800 |
| commit | 369c619f946f9ec1cf86cc83a7dcb11c29f1f0c7 (patch) | |
| tree | d96807ff3b7515f02171644d76abc121821ff2d7 /glusterfsd/src | |
| parent | 2b4b928ed350286192b63b10b18f85c669b741f8 (diff) | |
glusterfsd : fix null pointer dereference in glusterfs_handle_barrier
Change-Id: Iab86a3c4970e54c22d3170e68708e0ea432a8ea4
BUG: 1401921
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/16043
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'glusterfsd/src')
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 47093609f2c..92c3343ad21 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -1348,10 +1348,14 @@ glusterfs_handle_barrier (rpcsvc_request_t *req) req->rpc_err = GARBAGE_ARGS; goto out; } + ret = -1; ctx = glusterfsd_ctx; - GF_ASSERT (ctx); + GF_VALIDATE_OR_GOTO (THIS->name, ctx, out); + active = ctx->active; + GF_VALIDATE_OR_GOTO (THIS->name, active, out); + any = active->first; dict = dict_new(); |