X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=probes%2Flttng-probe-user.c;h=ed566ddb424b123a02f8ec1ba496517801a7eb2d;hb=a7031e6fc20dcd0b012f60280cff8842ff389abe;hp=dc6cca1ba0037521e73756da831a5d6c4b4da4a9;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/probes/lttng-probe-user.c b/probes/lttng-probe-user.c
index dc6cca1b..ed566ddb 100644
--- a/probes/lttng-probe-user.c
+++ b/probes/lttng-probe-user.c
@@ -19,7 +19,9 @@
  */
 
 #include <linux/uaccess.h>
-#include "lttng-probe-user.h"
+#include <linux/module.h>
+#include <wrapper/uaccess.h>
+#include <probes/lttng-probe-user.h>
 
 /*
  * Calculate string length. Include final null terminating character if there is
@@ -30,15 +32,19 @@
 long lttng_strlen_user_inatomic(const char *addr)
 {
 	long count = 0;
-	mm_segment_t old_fs = get_fs();
+	mm_segment_t old_fs;
 
+	if (!addr)
+		return 0;
+
+	old_fs = get_fs();
 	set_fs(KERNEL_DS);
 	pagefault_disable();
 	for (;;) {
 		char v;
 		unsigned long ret;
 
-		if (unlikely(!access_ok(VERIFY_READ,
+		if (unlikely(!lttng_access_ok(VERIFY_READ,
 				(__force const char __user *) addr,
 				sizeof(v))))
 			break;