X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fcompat-epoll.c;h=368fae19f6c3615b00760ce99b07d0b3250c7cf1;hp=1380ce85527a74dae304b2777de5a72c489b6b5c;hb=f263b7fd113e51d0737554e8232b8669e142a260;hpb=6cd525e813795a1d5e38feac8dedf2c73ffb1274

diff --git a/src/common/compat/compat-epoll.c b/src/common/compat/compat-epoll.c
index 1380ce855..368fae19f 100644
--- a/src/common/compat/compat-epoll.c
+++ b/src/common/compat/compat-epoll.c
@@ -51,6 +51,11 @@ static int resize_poll_event(struct lttng_poll_event *events,
 		PERROR("realloc epoll add");
 		goto error;
 	}
+	if (new_size > events->alloc_size) {
+		/* Zero newly allocated memory */
+		memset(ptr + events->alloc_size, 0,
+			(new_size - events->alloc_size) * sizeof(*ptr));
+	}
 	events->events = ptr;
 	events->alloc_size = new_size;
 
@@ -76,7 +81,7 @@ int compat_epoll_create(struct lttng_poll_event *events, int size, int flags)
 		size = poll_max_size;
 	}
 
-	ret = epoll_create1(flags);
+	ret = compat_glibc_epoll_create(size, flags);
 	if (ret < 0) {
 		/* At this point, every error is fatal */
 		PERROR("epoll_create1");
@@ -119,6 +124,11 @@ int compat_epoll_add(struct lttng_poll_event *events, int fd, uint32_t req_event
 		goto error;
 	}
 
+	/*
+	 * Zero struct epoll_event to ensure all representations of its
+	 * union are zeroed.
+	 */
+	memset(&ev, 0, sizeof(ev));
 	ev.events = req_events;
 	ev.data.fd = fd;
 
@@ -250,7 +260,7 @@ error:
 void compat_epoll_set_max_size(void)
 {
 	int ret, fd;
-	size_t size_ret;
+	ssize_t size_ret;
 	char buf[64];
 
 	poll_max_size = DEFAULT_POLL_SIZE;