diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-05-06 13:04:38 -0400 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-06-01 06:50:13 -0700 |
| commit | 24dd33929bbbc9a72360793048f17bf4e6cec8a3 (patch) | |
| tree | caa5c51a587252ff222ae885514a70a19ca05a1d /libglusterfs/src/glusterfs.h | |
| parent | a04eaf366779a0632e5b9cdd6d63de0eb62f7449 (diff) | |
libglusterfs (timer): race conditions, illegal mem access, mem leak
While investigating gfapi memory consumption with valgrind, valgrind
reported several memory access issues.
Also see the timer 'registry' being recreated (shortly) after being
freed during teardown due to the way it's currently written.
Passing ctx as data to gf_timer_proc() is prone to memory access
issues if ctx is freed before gf_timer_proc() terminates. (And in
fact this does happen, at least in valgrind.) gf_timer_proc() doesn't
need ctx for anything, it only needs ctx->timer, so just pass that.
Nothing ever calls gf_timer_registry_init(). Nothing outside of
timer.c that is. Making it and gf_timer_proc() static.
Change-Id: Ia28454dda0cf0de2fec94d76441d98c3927a906a
BUG: 1333925
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/14247
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Poornima G <pgurusid@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'libglusterfs/src/glusterfs.h')
| -rw-r--r-- | libglusterfs/src/glusterfs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h index d5fde68d76a..610dfc9e7d9 100644 --- a/libglusterfs/src/glusterfs.h +++ b/libglusterfs/src/glusterfs.h @@ -32,6 +32,7 @@ #include "glusterfs-fops.h" /* generated XDR values for FOPs */ #include "list.h" +#include "locking.h" #include "logging.h" #include "lkowner.h" #include "compat-uuid.h" @@ -428,7 +429,7 @@ struct _glusterfs_ctx { void *event_pool; void *iobuf_pool; void *logbuf_pool; - pthread_mutex_t lock; + gf_lock_t lock; size_t page_size; struct list_head graphs; /* double linked list of graphs - one per volfile parse */ glusterfs_graph_t *active; /* the latest graph in use */ |