X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=probes%2Flttng-probe-user.c;h=099a66b229a46fcc90f7b5fd7e504a3806d7d0e6;hb=1b25fe5879436a90fd22a731e9d3371807e78ba1;hp=cdf7955b63d07dba7e831d45e7cd17eb945ad777;hpb=8d90c035468a2d29937fda65bb916d80be5ddbd2;p=lttng-modules.git

diff --git a/probes/lttng-probe-user.c b/probes/lttng-probe-user.c
index cdf7955b..099a66b2 100644
--- a/probes/lttng-probe-user.c
+++ b/probes/lttng-probe-user.c
@@ -20,7 +20,7 @@
 
 #include <linux/uaccess.h>
 #include <linux/module.h>
-#include "lttng-probe-user.h"
+#include <probes/lttng-probe-user.h>
 
 /*
  * Calculate string length. Include final null terminating character if there is
@@ -31,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 (;;) {