From 147b3871180a699a642767d0cc0ea00fa69a33c8 Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Wed, 11 Mar 2015 16:41:06 +0530 Subject: afr: exit out of stack winds in for loops if call_count is zero ....in order to avoid a race where the fop cbk frees the frame's local variables and the fop tries to access it at a later point in time. Change-Id: I91d2696e5e183c61ea1368b3a538f9ed7f3851de BUG: 1200764 Signed-off-by: Ravishankar N Reviewed-on: http://review.gluster.org/9856 Tested-by: Gluster Build System Reviewed-by: pranith karampuri Reviewed-by: Niels de Vos --- xlators/cluster/afr/src/afr-open.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'xlators/cluster/afr/src/afr-open.c') diff --git a/xlators/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c index ccfd655eebb..9e49857508a 100644 --- a/xlators/cluster/afr/src/afr-open.c +++ b/xlators/cluster/afr/src/afr-open.c @@ -304,6 +304,7 @@ afr_fix_open (xlator_t *this, fd_t *fd, size_t need_open_count, int *need_open) int ret = -1; int32_t op_errno = 0; afr_fd_ctx_t *fd_ctx = NULL; + int call_count = -1; priv = this->private; @@ -335,6 +336,7 @@ afr_fix_open (xlator_t *this, fd_t *fd, size_t need_open_count, int *need_open) local->fd = fd_ref (fd); local->call_count = need_open_count; + call_count = need_open_count; gf_log (this->name, GF_LOG_DEBUG, "need open count: %zd", need_open_count); @@ -367,6 +369,8 @@ afr_fix_open (xlator_t *this, fd_t *fd, size_t need_open_count, int *need_open) fd_ctx->flags & (~O_TRUNC), local->fd, NULL); } + if (!--call_count) + break; } op_errno = 0; -- cgit