diff options
| author | N Balachandran <nbalacha@redhat.com> | 2017-05-19 15:22:12 +0530 |
|---|---|---|
| committer | Raghavendra Talur <rtalur@redhat.com> | 2017-05-29 08:51:53 +0000 |
| commit | a030f85da4d617a36d7fa9a3d815128d711a956b (patch) | |
| tree | 6298f1dcf67d838f5d73d3ccf0e53f4aa08ac711 | |
| parent | 7e962090a074f298e021ef2d8f6c1e303c022eaf (diff) | |
cluster/dht: Fix crash in dht_selfheal_dir_setattr
Use a local variable to store the call cnt used in the
for loop for the STACK_WIND so as not to access local
which may be freed by STACK_UNWIND after all fops return.
> BUG: 1452102
> Signed-off-by: N Balachandran <nbalacha@redhat.com>
> Reviewed-on: https://review.gluster.org/17343
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
(cherry picked from commit 17784aaa311494e4538c616f02bf95477ae781bc)
Change-Id: I24f49b6dbd29a2b706e388e2f6d5196c0f80afc5
BUG: 1453056
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: https://review.gluster.org/17349
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
| -rw-r--r-- | xlators/cluster/dht/src/dht-selfheal.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xlators/cluster/dht/src/dht-selfheal.c b/xlators/cluster/dht/src/dht-selfheal.c index 7fa05a95a53..eadc229fb3b 100644 --- a/xlators/cluster/dht/src/dht-selfheal.c +++ b/xlators/cluster/dht/src/dht-selfheal.c @@ -1088,6 +1088,7 @@ dht_selfheal_dir_setattr (call_frame_t *frame, loc_t *loc, struct iatt *stbuf, int i = 0, ret = -1; dht_local_t *local = NULL; xlator_t *this = NULL; + int cnt = 0; local = frame->local; this = frame->this; @@ -1113,7 +1114,8 @@ dht_selfheal_dir_setattr (call_frame_t *frame, loc_t *loc, struct iatt *stbuf, gf_uuid_copy (loc->gfid, local->gfid); local->call_cnt = missing_attr; - for (i = 0; i < layout->cnt; i++) { + cnt = layout->cnt; + for (i = 0; i < cnt; i++) { if (layout->list[i].err == -1) { gf_msg_trace (this->name, 0, "%s: setattr on subvol %s, gfid = %s", @@ -1237,6 +1239,7 @@ dht_selfheal_dir_mkdir_lookup_done (call_frame_t *frame, xlator_t *this) dict_t *dict = NULL; dht_layout_t *layout = NULL; loc_t *loc = NULL; + int cnt = 0; VALIDATE_OR_GOTO (this->private, err); @@ -1269,7 +1272,8 @@ dht_selfheal_dir_mkdir_lookup_done (call_frame_t *frame, xlator_t *this) DHT_MSG_DICT_SET_FAILED, "dict is NULL, need to make sure gfids are same"); - for (i = 0; i < layout->cnt; i++) { + cnt = layout->cnt; + for (i = 0; i < cnt; i++) { if (layout->list[i].err == ESTALE || layout->list[i].err == ENOENT || local->selfheal.force_mkdir) { |