From mboxrd@z Thu Jan 1 00:00:00 1970 From: dgoulet@efficios.com (David Goulet) Date: Mon, 11 Nov 2013 15:45:08 -0500 Subject: [lttng-dev] [PATCH lttng-tools v2] Fix: Don't dispatch uninitialized hash tables to the ht_cleanup thread In-Reply-To: <1384201808-29812-1-git-send-email-jeremie.galarneau@efficios.com> References: <1384198996-29028-1-git-send-email-jeremie.galarneau@efficios.com> <1384201808-29812-1-git-send-email-jeremie.galarneau@efficios.com> Message-ID: <20131111204508.GA25744@thessa> Merged! On 11 Nov (15:30:08), J?r?mie Galarneau wrote: > Some error-handling code paths may call ht_cleanup_push() with NULL hash > tables which will crash the clean-up thread. > > Signed-off-by: J?r?mie Galarneau > --- > src/bin/lttng-sessiond/utils.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/bin/lttng-sessiond/utils.c b/src/bin/lttng-sessiond/utils.c > index 2ff57cd..c9c51ed 100644 > --- a/src/bin/lttng-sessiond/utils.c > +++ b/src/bin/lttng-sessiond/utils.c > @@ -52,6 +52,9 @@ void ht_cleanup_push(struct lttng_ht *ht) > ssize_t ret; > int fd = ht_cleanup_pipe[1]; > > + if (!ht) { > + return; > + } > if (fd < 0) > return; > ret = lttng_write(fd, &ht, sizeof(ht)); > -- > 1.8.4.2 > > > _______________________________________________ > lttng-dev mailing list > lttng-dev at lists.lttng.org > http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 620 bytes Desc: Digital signature URL: