Version 2.7.7

[lttng-modules.git] / probes / lttng-probe-user.c

diff --git a/probes/lttng-probe-user.c b/probes/lttng-probe-user.c
index d0b5cf297367ce3c209b69ecb491e969ec321270..cdf7955b63d07dba7e831d45e7cd17eb945ad777 100644 (file)
--- a/probes/lttng-probe-user.c
+++ b/probes/lttng-probe-user.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/uaccess.h>
+#include <linux/module.h>
 #include "lttng-probe-user.h"
 
 /*
@@ -38,6 +39,10 @@ long lttng_strlen_user_inatomic(const char *addr)
                char v;
                unsigned long ret;
 
+               if (unlikely(!access_ok(VERIFY_READ,
+                               (__force const char __user *) addr,
+                               sizeof(v))))
+                       break;
                ret = __copy_from_user_inatomic(&v,
                        (__force const char __user *)(addr),
                        sizeof(v));
@@ -52,3 +57,4 @@ long lttng_strlen_user_inatomic(const char *addr)
        set_fs(old_fs);
        return count;
 }
+EXPORT_SYMBOL_GPL(lttng_strlen_user_inatomic);