Add lttng_waiter utils

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

diff --git a/src/common/readwrite.c b/src/common/readwrite.c
index 43d4e39eeeaed22896337995b440ba2e5fe46952..0e8684e260b59ea242bd708cf4f8a0105f814702 100644 (file)
--- a/src/common/readwrite.c
+++ b/src/common/readwrite.c
@@ -15,7 +15,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _LGPL_SOURCE
+#include <assert.h>
+#include <errno.h>
+#include <limits.h>
 #include <unistd.h>
+
 #include "readwrite.h"
 
 /*
@@ -23,16 +28,27 @@
  * Upon success, they return the "count" received as parameter.
  * They can return a negative value if an error occurs.
  * If a value lower than the requested "count" is returned, it means an
- * error occured.
+ * error occurred.
  * The error can be checked by querying errno.
  */
+LTTNG_HIDDEN
 ssize_t lttng_read(int fd, void *buf, size_t count)
 {
        size_t i = 0;
        ssize_t ret;
 
+       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);
+               ret = read(fd, buf + i, count - i);
                if (ret < 0) {
                        if (errno == EINTR) {
                                continue;       /* retry operation */
@@ -53,13 +69,24 @@ error:
        }
 }
 
+LTTNG_HIDDEN
 ssize_t lttng_write(int fd, const void *buf, size_t count)
 {
        size_t i = 0;
        ssize_t ret;
 
+       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);
+               ret = write(fd, buf + i, count - i);
                if (ret < 0) {
                        if (errno == EINTR) {
                                continue;       /* retry operation */