*/
#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
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,
+ (__force const char __user *) addr,
+ sizeof(v))))
+ break;
ret = __copy_from_user_inatomic(&v,
(__force const char __user *)(addr),
sizeof(v));
set_fs(old_fs);
return count;
}
+EXPORT_SYMBOL_GPL(lttng_strlen_user_inatomic);