|
 |
d2787b |
From 4186f81596a481a5c0c5a707fc9b2358ee8f49f0 Mon Sep 17 00:00:00 2001
|
|
|
d2787b |
From: nik-redhat <nladha@redhat.com>
|
|
|
d2787b |
Date: Fri, 3 Jul 2020 17:18:33 +0530
|
|
|
d2787b |
Subject: [PATCH 599/610] afr: null dereference & nagative value
|
|
|
d2787b |
|
|
|
d2787b |
Added a check for NULL before dereferencing
|
|
|
d2787b |
the object as it may be NULL in few cases
|
|
|
d2787b |
inside the funtion. Also, added a check for
|
|
|
d2787b |
the negative value of gfid_idx.
|
|
|
d2787b |
|
|
|
d2787b |
CID: 1430140
|
|
|
d2787b |
CID: 1430145
|
|
|
d2787b |
|
|
|
d2787b |
>Change-Id: Ib7d23459b48bbc471dbcccab6d20572261882d11
|
|
|
d2787b |
>Updates: #1060
|
|
|
d2787b |
>Signed-off-by: nik-redhat <nladha@redhat.com>
|
|
|
d2787b |
|
|
|
d2787b |
Upstream link: https://review.gluster.org/c/glusterfs/+/24671
|
|
|
d2787b |
BUG: 1997447
|
|
|
d2787b |
|
|
|
d2787b |
Change-Id: I7e705a106d97001b67f5cde8589413c0c24ee507
|
|
|
d2787b |
Signed-off-by: nik-redhat <nladha@redhat.com>
|
|
|
d2787b |
Reviewed-on: https://code.engineering.redhat.com/gerrit/c/rhs-glusterfs/+/280085
|
|
|
d2787b |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
d2787b |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
d2787b |
---
|
|
|
d2787b |
xlators/cluster/afr/src/afr-self-heal-common.c | 2 +-
|
|
|
d2787b |
xlators/cluster/afr/src/afr-self-heal-name.c | 2 +-
|
|
|
d2787b |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
d2787b |
|
|
|
d2787b |
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
|
|
|
d2787b |
index 0954d2c..cbd5117 100644
|
|
|
d2787b |
--- a/xlators/cluster/afr/src/afr-self-heal-common.c
|
|
|
d2787b |
+++ b/xlators/cluster/afr/src/afr-self-heal-common.c
|
|
|
d2787b |
@@ -140,7 +140,7 @@ heal:
|
|
|
d2787b |
}
|
|
|
d2787b |
}
|
|
|
d2787b |
out:
|
|
|
d2787b |
- if (gfid_idx && (*gfid_idx == -1) && (ret == 0)) {
|
|
|
d2787b |
+ if (gfid_idx && (*gfid_idx == -1) && (ret == 0) && local) {
|
|
|
d2787b |
ret = -afr_final_errno(local, priv);
|
|
|
d2787b |
}
|
|
|
d2787b |
loc_wipe(&loc;;
|
|
|
d2787b |
diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c
|
|
|
d2787b |
index 9ec2066..c5ab8d7 100644
|
|
|
d2787b |
--- a/xlators/cluster/afr/src/afr-self-heal-name.c
|
|
|
d2787b |
+++ b/xlators/cluster/afr/src/afr-self-heal-name.c
|
|
|
d2787b |
@@ -353,7 +353,7 @@ __afr_selfheal_name_do(call_frame_t *frame, xlator_t *this, inode_t *parent,
|
|
|
d2787b |
ret = __afr_selfheal_assign_gfid(this, parent, pargfid, bname, inode,
|
|
|
d2787b |
replies, gfid, locked_on, source, sources,
|
|
|
d2787b |
is_gfid_absent, &gfid_idx);
|
|
|
d2787b |
- if (ret)
|
|
|
d2787b |
+ if (ret || (gfid_idx < 0))
|
|
|
d2787b |
return ret;
|
|
|
d2787b |
|
|
|
d2787b |
ret = __afr_selfheal_name_impunge(frame, this, parent, pargfid, bname,
|
|
|
d2787b |
--
|
|
|
d2787b |
1.8.3.1
|
|
|
d2787b |
|