Fix: build against out-of-tree kernel build

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

diff --git a/probes/lttng-probe-user.c b/probes/lttng-probe-user.c
index 94ecf2f1cffb339d53d9c1dc4d62f58a13dc9ece..e92107d94cfbd1948eb3773deb6c55a228f48505 100644 (file)
--- a/probes/lttng-probe-user.c
+++ b/probes/lttng-probe-user.c
@@ -19,7 +19,8 @@
  */
 
 #include <linux/uaccess.h>
-#include "lttng-probe-user.h"
+#include <linux/module.h>
+#include <probes/lttng-probe-user.h>
 
 /*
  * Calculate string length. Include final null terminating character if there is
@@ -36,12 +37,16 @@ long lttng_strlen_user_inatomic(const char *addr)
        pagefault_disable();
        for (;;) {
                char v;
-               long ret;
+               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));
-               if (unlikely(ret == -EFAULT))
+               if (unlikely(ret > 0))
                        break;
                count++;
                if (unlikely(!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);