From 89dee8b46e126bc1d7541da90fa60844aa83451e Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Thu, 21 Jul 2016 12:14:27 +0530 Subject: glfs/upcall: entries should be removed under mutex lock During poll, upcall entries should be removed from the upcall_list only under upcall_list_mutex lock. Otherwise it could result in the list corruption if there are entries being added during poll resulting in memory leak. Also addressed a probable leak during any failures with upcall entry addition. Change-Id: I468183f961eb6faed9a0a1bcb783705f711641fc BUG: 1358608 Signed-off-by: Soumya Koduri Reviewed-on: http://review.gluster.org/14972 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Shyamsundar Ranganathan CentOS-regression: Gluster Build System Reviewed-by: Jeff Darcy --- api/src/glfs-fops.c | 4 +++- api/src/glfs-handleops.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'api') diff --git a/api/src/glfs-fops.c b/api/src/glfs-fops.c index cf809705c8a..a1858b17b8b 100644 --- a/api/src/glfs-fops.c +++ b/api/src/glfs-fops.c @@ -4339,8 +4339,10 @@ priv_glfs_process_upcall_event (struct glfs *fs, void *data) ret = 0; out: - if (ret && u_list) + if (ret && u_list) { + GF_FREE (u_list->upcall_data.data); GF_FREE(u_list); + } return; } diff --git a/api/src/glfs-handleops.c b/api/src/glfs-handleops.c index 373560a00d8..c68a54512d3 100644 --- a/api/src/glfs-handleops.c +++ b/api/src/glfs-handleops.c @@ -2031,6 +2031,7 @@ pub_glfs_h_poll_upcall (struct glfs *fs, struct glfs_callback_arg *up_arg) &fs->upcall_list, upcall_list) { found = 1; + list_del_init (&u_list->upcall_list); break; } } @@ -2067,7 +2068,6 @@ pub_glfs_h_poll_upcall (struct glfs *fs, struct glfs_callback_arg *up_arg) up_arg->reason = reason; - list_del_init (&u_list->upcall_list); GF_FREE (u_list->upcall_data.data); GF_FREE (u_list); } -- cgit