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

diff --git a/probes/lttng-probe-user.c b/probes/lttng-probe-user.c
index dc6cca1b..099a66b2 100644
--- 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
@@ -30,8 +31,12 @@
 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 (;;) {