From a865837a7cac3e1a35907d9b216caf2eb1c7c00c Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 13 Apr 2020 12:34:46 -0400
Subject: [PATCH] wrapper: remove lttng_access_ok() wrapper

---
 lib/ringbuffer/backend.h              |  8 ++++----
 lib/ringbuffer/ring_buffer_iterator.c |  4 ++--
 lttng-filter-interpreter.c            |  5 ++---
 probes/lttng-probe-user.c             |  4 +---
 wrapper/uaccess.h                     | 29 ---------------------------
 5 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 wrapper/uaccess.h

diff --git a/lib/ringbuffer/backend.h b/lib/ringbuffer/backend.h
index da4e92b9..189b25be 100644
--- a/lib/ringbuffer/backend.h
+++ b/lib/ringbuffer/backend.h
@@ -21,7 +21,7 @@
 #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>
@@ -289,7 +289,7 @@ void lib_ring_buffer_copy_from_user_inatomic(const struct lib_ring_buffer_config
 
 	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)) {
@@ -359,7 +359,7 @@ void lib_ring_buffer_strcpy_from_user_inatomic(const struct lib_ring_buffer_conf
 
 	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)) {
@@ -449,7 +449,7 @@ unsigned long lib_ring_buffer_copy_from_user_check_nofault(void *dest,
 	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);
diff --git a/lib/ringbuffer/ring_buffer_iterator.c b/lib/ringbuffer/ring_buffer_iterator.c
index 00faa729..382a477d 100644
--- a/lib/ringbuffer/ring_buffer_iterator.c
+++ b/lib/ringbuffer/ring_buffer_iterator.c
@@ -11,7 +11,7 @@
 
 #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>
@@ -606,7 +606,7 @@ ssize_t channel_ring_buffer_file_read(struct file *filp,
 	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 */
diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index c7ce7d33..811a2622 100644
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -7,7 +7,7 @@
  * 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>
@@ -30,8 +30,7 @@ char get_char(struct estack_entry *reg, size_t offset)
 		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. */
diff --git a/probes/lttng-probe-user.c b/probes/lttng-probe-user.c
index b777c40d..411899d1 100644
--- a/probes/lttng-probe-user.c
+++ b/probes/lttng-probe-user.c
@@ -7,7 +7,6 @@
 
 #include <linux/uaccess.h>
 #include <linux/module.h>
-#include <wrapper/uaccess.h>
 #include <probes/lttng-probe-user.h>
 
 /*
@@ -31,8 +30,7 @@ long lttng_strlen_user_inatomic(const char *addr)
 		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,
diff --git a/wrapper/uaccess.h b/wrapper/uaccess.h
deleted file mode 100644
index 7abe5e50..00000000
--- a/wrapper/uaccess.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 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 */
-- 
2.34.1