#include <linux/list.h>
#include <linux/fs.h>
#include <linux/mm.h>
-#include <wrapper/uaccess.h>
+#include <linux/uaccess.h>
/* Internal helpers */
#include <wrapper/ringbuffer/backend_internal.h>
set_fs(KERNEL_DS);
pagefault_disable();
- if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
+ if (unlikely(!access_ok(src, len)))
goto fill_buffer;
if (likely(pagecpy == len)) {
set_fs(KERNEL_DS);
pagefault_disable();
- if (unlikely(!lttng_access_ok(VERIFY_READ, src, len)))
+ if (unlikely(!access_ok(src, len)))
goto fill_buffer;
if (likely(pagecpy == len)) {
unsigned long ret;
mm_segment_t old_fs;
- if (!lttng_access_ok(VERIFY_READ, src, len))
+ if (!access_ok(src, len))
return 1;
old_fs = get_fs();
set_fs(KERNEL_DS);
#include <wrapper/ringbuffer/iterator.h>
#include <wrapper/file.h>
-#include <wrapper/uaccess.h>
+#include <linux/uaccess.h>
#include <linux/jiffies.h>
#include <linux/delay.h>
#include <linux/module.h>
ssize_t len;
might_sleep();
- if (!lttng_access_ok(VERIFY_WRITE, user_buf, count))
+ if (!access_ok(user_buf, count))
return -EFAULT;
/* Finish copy of previous record */
* Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
-#include <wrapper/uaccess.h>
+#include <linux/uaccess.h>
#include <wrapper/frame.h>
#include <wrapper/types.h>
#include <linux/swab.h>
char c;
/* Handle invalid access as end of string. */
- if (unlikely(!lttng_access_ok(VERIFY_READ,
- reg->u.s.user_str + offset,
+ if (unlikely(!access_ok(reg->u.s.user_str + offset,
sizeof(c))))
return '\0';
/* Handle fault (nonzero return value) as end of string. */
#include <linux/uaccess.h>
#include <linux/module.h>
-#include <wrapper/uaccess.h>
#include <probes/lttng-probe-user.h>
/*
char v;
unsigned long ret;
- if (unlikely(!lttng_access_ok(VERIFY_READ,
- (__force const char __user *) addr,
+ if (unlikely(!access_ok((__force const char __user *) addr,
sizeof(v))))
break;
ret = __copy_from_user_inatomic(&v,
+++ /dev/null
-/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
- *
- * wrapper/uaccess.h
- *
- * wrapper around linux/uaccess.h.
- *
- * Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
- */
-
-#ifndef _LTTNG_WRAPPER_UACCESS_H
-#define _LTTNG_WRAPPER_UACCESS_H
-
-#include <linux/uaccess.h>
-#include <lttng-kernel-version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) || \
- LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0))
-
-#define VERIFY_READ 0
-#define VERIFY_WRITE 1
-#define lttng_access_ok(type, addr, size) access_ok(addr, size)
-
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) */
-
-#define lttng_access_ok(type, addr, size) access_ok(type, addr, size)
-
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) */
-
-#endif /* _LTTNG_WRAPPER_UACCESS_H */