From 333474e0d6efe1a2b3a9ecffc9bdff3e49325910 Mon Sep 17 00:00:00 2001 From: Zhou Zhengping Date: Tue, 9 May 2017 20:57:34 +0800 Subject: libglusterfs: fix race condition in client_ctx_set follow procedures: 1.thread1 client_ctx_get return NULL 2.thread 2 client_ctx_set ctx1 ok 3.thread1 client_ctx_set ctx2 ok thread1 use ctx1, thread2 use ctx2 and ctx1 will leak Change-Id: I990b02905edd1b3179323ada56888f852d20f538 BUG: 1449232 Signed-off-by: Zhou Zhengping Reviewed-on: https://review.gluster.org/17219 NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Raghavendra G Smoke: Gluster Build System Reviewed-by: Jeff Darcy --- xlators/features/locks/src/posix.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'xlators/features/locks/src') diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index 44ca5004171..1b691c0a878 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -3480,6 +3480,7 @@ pl_ctx_get (client_t *client, xlator_t *xlator) { void *tmp = NULL; pl_ctx_t *ctx = NULL; + pl_ctx_t *setted_ctx = NULL; client_ctx_get (client, xlator, &tmp); @@ -3498,10 +3499,11 @@ pl_ctx_get (client_t *client, xlator_t *xlator) INIT_LIST_HEAD (&ctx->entrylk_lockers); INIT_LIST_HEAD (&ctx->metalk_list); - if (client_ctx_set (client, xlator, ctx) != 0) { + setted_ctx = client_ctx_set (client, xlator, ctx); + if (ctx != setted_ctx) { pthread_mutex_destroy (&ctx->lock); GF_FREE (ctx); - ctx = NULL; + ctx = setted_ctx; } out: return ctx; -- cgit