X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fcompat-epoll.c;h=25c9955045b3bb09435beea959d891c67f1c77a4;hp=903a9f8256eeafad9e678f565ba6c1b60f0e9c2a;hb=13021756b87be3b7e41083f607fa0a54792d153a;hpb=cfa9a5a2b4a96e0d6a9eeddd2622a6d7c173b7ac

diff --git a/src/common/compat/compat-epoll.c b/src/common/compat/compat-epoll.c
index 903a9f825..25c995504 100644
--- a/src/common/compat/compat-epoll.c
+++ b/src/common/compat/compat-epoll.c
@@ -250,6 +250,7 @@ error:
 void compat_epoll_set_max_size(void)
 {
 	int ret, fd;
+	ssize_t size_ret;
 	char buf[64];
 
 	poll_max_size = DEFAULT_POLL_SIZE;
@@ -259,11 +260,16 @@ void compat_epoll_set_max_size(void)
 		return;
 	}
 
-	ret = read(fd, buf, sizeof(buf));
-	if (ret < 0) {
+	size_ret = lttng_read(fd, buf, sizeof(buf));
+	/*
+	 * Allow reading a file smaller than buf, but keep space for
+	 * final \0.
+	 */
+	if (size_ret < 0 || size_ret >= sizeof(buf)) {
 		PERROR("read set max size");
 		goto error;
 	}
+	buf[size_ret] = '\0';
 
 	poll_max_size = atoi(buf);
 	if (poll_max_size == 0) {