Commit 5e6039d8 authored by Al Viro's avatar Al Viro

uaccess: move VERIFY_{READ,WRITE} definitions to linux/uaccess.h

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c1ae3cfa
...@@ -20,9 +20,6 @@ ...@@ -20,9 +20,6 @@
#define KERNEL_DS ((mm_segment_t) { 0UL }) #define KERNEL_DS ((mm_segment_t) { 0UL })
#define USER_DS ((mm_segment_t) { -0x40000000000UL }) #define USER_DS ((mm_segment_t) { -0x40000000000UL })
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define get_fs() (current_thread_info()->addr_limit) #define get_fs() (current_thread_info()->addr_limit)
#define get_ds() (KERNEL_DS) #define get_ds() (KERNEL_DS)
#define set_fs(x) (current_thread_info()->addr_limit = (x)) #define set_fs(x) (current_thread_info()->addr_limit = (x))
......
...@@ -26,9 +26,6 @@ ...@@ -26,9 +26,6 @@
#define __put_user_unaligned __put_user #define __put_user_unaligned __put_user
#endif #endif
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is
......
...@@ -36,9 +36,6 @@ ...@@ -36,9 +36,6 @@
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/compiler.h> #include <asm/compiler.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The exception table consists of pairs of relative offsets: the first * The exception table consists of pairs of relative offsets: the first
* is the relative offset to an instruction that is allowed to fault, * is the relative offset to an instruction that is allowed to fault,
......
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/sched.h> #include <linux/sched.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
typedef struct { typedef struct {
unsigned int is_user_space; unsigned int is_user_space;
} mm_segment_t; } mm_segment_t;
......
...@@ -29,9 +29,6 @@ static inline void set_fs(mm_segment_t fs) ...@@ -29,9 +29,6 @@ static inline void set_fs(mm_segment_t fs)
#define segment_eq(a, b) ((a) == (b)) #define segment_eq(a, b) ((a) == (b))
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define access_ok(type, addr, size) _access_ok((unsigned long)(addr), (size)) #define access_ok(type, addr, size) _access_ok((unsigned long)(addr), (size))
/* /*
......
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/page.h> #include <asm/page.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The fs value determines whether argument validity checking should be * The fs value determines whether argument validity checking should be
* performed or not. If get_fs() == USER_DS, checking is performed, with * performed or not. If get_fs() == USER_DS, checking is performed, with
......
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
#define __ptr(x) ((unsigned long __force *)(x)) #define __ptr(x) ((unsigned long __force *)(x))
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* check that a range of addresses falls within the current address limit * check that a range of addresses falls within the current address limit
*/ */
......
...@@ -50,8 +50,6 @@ ...@@ -50,8 +50,6 @@
* reasonably simple and not *too* slow. After all, we've got the * reasonably simple and not *too* slow. After all, we've got the
* MMU for backup. * MMU for backup.
*/ */
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define __access_ok(addr, size) \ #define __access_ok(addr, size) \
((get_fs().seg == KERNEL_DS.seg) || \ ((get_fs().seg == KERNEL_DS.seg) || \
......
...@@ -48,9 +48,6 @@ ...@@ -48,9 +48,6 @@
#define KERNEL_DS ((mm_segment_t) { ~0UL }) /* cf. access_ok() */ #define KERNEL_DS ((mm_segment_t) { ~0UL }) /* cf. access_ok() */
#define USER_DS ((mm_segment_t) { TASK_SIZE-1 }) /* cf. access_ok() */ #define USER_DS ((mm_segment_t) { TASK_SIZE-1 }) /* cf. access_ok() */
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define get_ds() (KERNEL_DS) #define get_ds() (KERNEL_DS)
#define get_fs() (current_thread_info()->addr_limit) #define get_fs() (current_thread_info()->addr_limit)
#define set_fs(x) (current_thread_info()->addr_limit = (x)) #define set_fs(x) (current_thread_info()->addr_limit = (x))
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/setup.h> #include <asm/setup.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The fs value determines whether argument validity checking should be * The fs value determines whether argument validity checking should be
* performed or not. If get_fs() == USER_DS, checking is performed, with * performed or not. If get_fs() == USER_DS, checking is performed, with
......
...@@ -10,9 +10,6 @@ ...@@ -10,9 +10,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/segment.h> #include <asm/segment.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* We let the MMU do all checking */ /* We let the MMU do all checking */
static inline int access_ok(int type, const void __user *addr, static inline int access_ok(int type, const void __user *addr,
unsigned long size) unsigned long size)
......
...@@ -10,9 +10,6 @@ ...@@ -10,9 +10,6 @@
#include <asm/segment.h> #include <asm/segment.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define access_ok(type,addr,size) _access_ok((unsigned long)(addr),(size)) #define access_ok(type,addr,size) _access_ok((unsigned long)(addr),(size))
/* /*
......
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
*/ */
#include <linux/sched.h> #include <linux/sched.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The fs value determines whether argument validity checking should be * The fs value determines whether argument validity checking should be
* performed or not. If get_fs() == USER_DS, checking is performed, with * performed or not. If get_fs() == USER_DS, checking is performed, with
......
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <linux/string.h> #include <linux/string.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* On Microblaze the fs value is actually the top of the corresponding * On Microblaze the fs value is actually the top of the corresponding
* address space. * address space.
......
...@@ -71,9 +71,6 @@ extern u64 __ua_limit; ...@@ -71,9 +71,6 @@ extern u64 __ua_limit;
#define USER_DS ((mm_segment_t) { __UA_LIMIT }) #define USER_DS ((mm_segment_t) { __UA_LIMIT })
#endif #endif
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define get_ds() (KERNEL_DS) #define get_ds() (KERNEL_DS)
#define get_fs() (current_thread_info()->addr_limit) #define get_fs() (current_thread_info()->addr_limit)
#define set_fs(x) (current_thread_info()->addr_limit = (x)) #define set_fs(x) (current_thread_info()->addr_limit = (x))
......
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
#include <asm/page.h> #include <asm/page.h>
#include <asm/errno.h> #include <asm/errno.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The fs value determines whether argument validity checking should be * The fs value determines whether argument validity checking should be
* performed or not. If get_fs() == USER_DS, checking is performed, with * performed or not. If get_fs() == USER_DS, checking is performed, with
......
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
#include <asm/page.h> #include <asm/page.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is
......
...@@ -28,9 +28,6 @@ ...@@ -28,9 +28,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <asm/page.h> #include <asm/page.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The fs value determines whether argument validity checking should be * The fs value determines whether argument validity checking should be
* performed or not. If get_fs() == USER_DS, checking is performed, with * performed or not. If get_fs() == USER_DS, checking is performed, with
......
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/thread_info.h> #include <linux/thread_info.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define KERNEL_DS ((mm_segment_t){0}) #define KERNEL_DS ((mm_segment_t){0})
#define USER_DS ((mm_segment_t){1}) #define USER_DS ((mm_segment_t){1})
......
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/page.h> #include <asm/page.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The fs value determines whether argument validity checking should be * The fs value determines whether argument validity checking should be
* performed or not. If get_fs() == USER_DS, checking is performed, with * performed or not. If get_fs() == USER_DS, checking is performed, with
......
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/ctl_reg.h> #include <asm/ctl_reg.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The fs value determines whether argument validity checking should be * The fs value determines whether argument validity checking should be
......
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
#include <linux/thread_info.h> #include <linux/thread_info.h>
#include <asm/extable.h> #include <asm/extable.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define get_ds() (KERNEL_DS) #define get_ds() (KERNEL_DS)
#define get_fs() (current_thread_info()->addr_limit) #define get_fs() (current_thread_info()->addr_limit)
#define segment_eq(a, b) ((a).seg == (b).seg) #define segment_eq(a, b) ((a).seg == (b).seg)
......
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <asm/segment.h> #include <asm/segment.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define __addr_ok(addr) \ #define __addr_ok(addr) \
((unsigned long __force)(addr) < current_thread_info()->addr_limit.seg) ((unsigned long __force)(addr) < current_thread_info()->addr_limit.seg)
......
...@@ -30,9 +30,6 @@ ...@@ -30,9 +30,6 @@
#define KERNEL_DS ((mm_segment_t) { 0 }) #define KERNEL_DS ((mm_segment_t) { 0 })
#define USER_DS ((mm_segment_t) { -1 }) #define USER_DS ((mm_segment_t) { -1 })
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define get_ds() (KERNEL_DS) #define get_ds() (KERNEL_DS)
#define get_fs() (current->thread.current_ds) #define get_fs() (current->thread.current_ds)
#define set_fs(val) ((current->thread.current_ds) = (val)) #define set_fs(val) ((current->thread.current_ds) = (val))
......
...@@ -36,9 +36,6 @@ ...@@ -36,9 +36,6 @@
#define KERNEL_DS ((mm_segment_t) { ASI_P }) #define KERNEL_DS ((mm_segment_t) { ASI_P })
#define USER_DS ((mm_segment_t) { ASI_AIUS }) /* har har har */ #define USER_DS ((mm_segment_t) { ASI_AIUS }) /* har har har */
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define get_fs() ((mm_segment_t){(current_thread_info()->current_ds)}) #define get_fs() ((mm_segment_t){(current_thread_info()->current_ds)})
#define get_ds() (KERNEL_DS) #define get_ds() (KERNEL_DS)
......
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/page.h> #include <asm/page.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The fs value determines whether argument validity checking should be * The fs value determines whether argument validity checking should be
* performed or not. If get_fs() == USER_DS, checking is performed, with * performed or not. If get_fs() == USER_DS, checking is performed, with
......
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
#include <asm/smap.h> #include <asm/smap.h>
#include <asm/extable.h> #include <asm/extable.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
/* /*
* The fs value determines whether argument validity checking should be * The fs value determines whether argument validity checking should be
* performed or not. If get_fs() == USER_DS, checking is performed, with * performed or not. If get_fs() == USER_DS, checking is performed, with
......
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/types.h> #include <asm/types.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#include <asm/current.h> #include <asm/current.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#include <asm/processor.h> #include <asm/processor.h>
......
...@@ -20,9 +20,6 @@ ...@@ -20,9 +20,6 @@
#include <linux/prefetch.h> #include <linux/prefetch.h>
#include <asm/types.h> #include <asm/types.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#include <linux/sched.h> #include <linux/sched.h>
/* /*
......
...@@ -35,9 +35,6 @@ static inline void set_fs(mm_segment_t fs) ...@@ -35,9 +35,6 @@ static inline void set_fs(mm_segment_t fs)
#define segment_eq(a, b) ((a).seg == (b).seg) #define segment_eq(a, b) ((a).seg == (b).seg)
#endif #endif
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#define access_ok(type, addr, size) __access_ok((unsigned long)(addr),(size)) #define access_ok(type, addr, size) __access_ok((unsigned long)(addr),(size))
/* /*
......
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
#define __LINUX_UACCESS_H__ #define __LINUX_UACCESS_H__
#include <linux/sched.h> #include <linux/sched.h>
#define VERIFY_READ 0
#define VERIFY_WRITE 1
#include <asm/uaccess.h> #include <asm/uaccess.h>
static __always_inline void pagefault_disabled_inc(void) static __always_inline void pagefault_disabled_inc(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment