Fix: cleanup relayd on any I/O error in read subbuffer mmap

[lttng-tools.git] / src / common / readwrite.c

diff --git a/src/common/readwrite.c b/src/common/readwrite.c
index 0098f759b2d57dc156088126d457a86226517e65..d33e0519088049bdb4895198d167d872522d9671 100644 (file)
--- a/src/common/readwrite.c
+++ b/src/common/readwrite.c
@@ -17,6 +17,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <limits.h>
 #include <unistd.h>
 
 #include "readwrite.h"
@@ -34,9 +35,16 @@ ssize_t lttng_read(int fd, void *buf, size_t count)
        size_t i = 0;
        ssize_t ret;
 
-       assert(fd >= 0);
        assert(buf);
 
+       /*
+        * Deny a read count that can be bigger then the returned value max size.
+        * This makes the function to never return an overflow value.
+        */
+       if (count > SSIZE_MAX) {
+               return -EINVAL;
+       }
+
        do {
                ret = read(fd, buf + i, count - i);
                if (ret < 0) {
@@ -64,9 +72,16 @@ ssize_t lttng_write(int fd, const void *buf, size_t count)
        size_t i = 0;
        ssize_t ret;
 
-       assert(fd >= 0);
        assert(buf);
 
+       /*
+        * Deny a write count that can be bigger then the returned value max size.
+        * This makes the function to never return an overflow value.
+        */
+       if (count > SSIZE_MAX) {
+               return -EINVAL;
+       }
+
        do {
                ret = write(fd, buf + i, count - i);
                if (ret < 0) {