X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2Flttng-probe-user.c;h=e92107d94cfbd1948eb3773deb6c55a228f48505;hb=25337cb556cedb95ff65c1e91aab0dea6a3e77b4;hp=d0b5cf297367ce3c209b69ecb491e969ec321270;hpb=2a8b83a12300795c2f82ba19826e2eeaa5135030;p=lttng-modules.git

diff --git a/probes/lttng-probe-user.c b/probes/lttng-probe-user.c
index d0b5cf29..e92107d9 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
@@ -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);