|
 |
256ebe |
From 45c9eeb5544738d4d1d0aefb8a7f61e5d8859ad8 Mon Sep 17 00:00:00 2001
|
|
|
256ebe |
From: Mohammed Rafi KC <rkavunga@redhat.com>
|
|
|
256ebe |
Date: Tue, 12 Mar 2019 18:00:37 +0530
|
|
|
256ebe |
Subject: [PATCH 103/124] dht: NULL check before setting error flag
|
|
|
256ebe |
|
|
|
256ebe |
Function dht_common_mark_mdsxattr blindly setting value for
|
|
|
256ebe |
an integer pointer without validating it. In fact there are
|
|
|
256ebe |
two callers of this function that passes NULL value to the
|
|
|
256ebe |
same pointer which leads to a crash.
|
|
|
256ebe |
|
|
|
256ebe |
Backport of : https://review.gluster.org/#/c/22345/
|
|
|
256ebe |
|
|
|
256ebe |
>Change-Id: Id94ffe216f6a21f007b3291bff0b1e1c1989075c
|
|
|
256ebe |
>fixes: bz#1687811
|
|
|
256ebe |
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
|
|
|
256ebe |
|
|
|
256ebe |
Change-Id: Id9785c16184fd80e8184e5ae135fb63bf44692cd
|
|
|
256ebe |
BUG: 1471742
|
|
|
256ebe |
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
|
|
|
256ebe |
Reviewed-on: https://code.engineering.redhat.com/gerrit/167846
|
|
|
256ebe |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
256ebe |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
256ebe |
---
|
|
|
256ebe |
xlators/cluster/dht/src/dht-common.c | 3 ++-
|
|
|
256ebe |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
256ebe |
|
|
|
256ebe |
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
|
|
|
256ebe |
index 367548f..2a68193 100644
|
|
|
256ebe |
--- a/xlators/cluster/dht/src/dht-common.c
|
|
|
256ebe |
+++ b/xlators/cluster/dht/src/dht-common.c
|
|
|
256ebe |
@@ -852,7 +852,8 @@ dht_common_mark_mdsxattr(call_frame_t *frame, int *errst,
|
|
|
256ebe |
"Failed to get hashed subvol for path %s"
|
|
|
256ebe |
"gfid is %s ",
|
|
|
256ebe |
local->loc.path, gfid_local);
|
|
|
256ebe |
- (*errst) = 1;
|
|
|
256ebe |
+ if (errst)
|
|
|
256ebe |
+ (*errst) = 1;
|
|
|
256ebe |
ret = -1;
|
|
|
256ebe |
goto out;
|
|
|
256ebe |
}
|
|
|
256ebe |
--
|
|
|
256ebe |
1.8.3.1
|
|
|
256ebe |
|