52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
|
From 84aaaded4e958a10c7492233c053e3c681f2d575 Mon Sep 17 00:00:00 2001
|
||
|
|
From: nik-redhat <nladha@redhat.com>
|
||
|
|
Date: Thu, 2 Jul 2020 18:10:32 +0530
|
||
|
|
Subject: [PATCH 598/610] glusterd: null dereference
|
||
|
|
|
||
|
|
Issue:
|
||
|
|
There has been either an explicit null
|
||
|
|
dereference or a dereference after null
|
||
|
|
check in some cases.
|
||
|
|
|
||
|
|
Fix:
|
||
|
|
Added the proper condition for null check
|
||
|
|
and fixed null derefencing.
|
||
|
|
|
||
|
|
CID: 1430106 : Dereference after null check
|
||
|
|
CID: 1430120 : Explicit null dereferenced
|
||
|
|
CID: 1430132 : Dereference after null check
|
||
|
|
CID: 1430134 : Dereference after null check
|
||
|
|
|
||
|
|
>Change-Id: I7e795cf9f7146a633097c26a766f16b159881fa3
|
||
|
|
>Updates: #1060
|
||
|
|
>Signed-off-by: nik-redhat <nladha@redhat.com>
|
||
|
|
|
||
|
|
Upstream link: https://review.gluster.org/c/glusterfs/+/24664
|
||
|
|
BUG: 1997447
|
||
|
|
|
||
|
|
Change-Id: I2b2632c93094d0e7b9fbd65a2ca2b0eaf6212d79
|
||
|
|
Signed-off-by: nik-redhat <nladha@redhat.com>
|
||
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/c/rhs-glusterfs/+/280083
|
||
|
|
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
||
|
|
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
||
|
|
---
|
||
|
|
xlators/mgmt/glusterd/src/glusterd-syncop.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c
|
||
|
|
index 05c9e11..f1807cd 100644
|
||
|
|
--- a/xlators/mgmt/glusterd/src/glusterd-syncop.c
|
||
|
|
+++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c
|
||
|
|
@@ -1797,7 +1797,7 @@ gd_brick_op_phase(glusterd_op_t op, dict_t *op_ctx, dict_t *req_dict,
|
||
|
|
pending_node = NULL;
|
||
|
|
ret = 0;
|
||
|
|
out:
|
||
|
|
- if (pending_node)
|
||
|
|
+ if (pending_node && pending_node->node)
|
||
|
|
glusterd_pending_node_put_rpc(pending_node);
|
||
|
|
|
||
|
|
if (rsp_dict)
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|