tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
um: kill um_uaccess.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
authored by
Al Viro
and committed by
Richard Weinberger
fced95ca
ece67c86
+84
-99
+84
-5
arch/um/include/asm/uaccess.h
+84
-5
arch/um/include/asm/uaccess.h
···
6
6
#ifndef __UM_UACCESS_H
7
7
#define __UM_UACCESS_H
8
8
9
-
#include <asm/errno.h>
10
-
#include <asm/processor.h>
11
-
12
9
/* thread_info has a mm_segment_t in it, so put the definition up here */
13
10
typedef struct {
14
11
unsigned long seg;
15
12
} mm_segment_t;
16
13
17
-
#include "linux/thread_info.h"
14
+
#include <linux/thread_info.h>
15
+
#include <linux/errno.h>
16
+
#include <asm/processor.h>
17
+
#include <asm/elf.h>
18
18
19
19
#define VERIFY_READ 0
20
20
#define VERIFY_WRITE 1
···
38
38
39
39
#define segment_eq(a, b) ((a).seg == (b).seg)
40
40
41
-
#include "um_uaccess.h"
41
+
#define __under_task_size(addr, size) \
42
+
(((unsigned long) (addr) < TASK_SIZE) && \
43
+
(((unsigned long) (addr) + (size)) < TASK_SIZE))
44
+
45
+
#define __access_ok_vsyscall(type, addr, size) \
46
+
((type == VERIFY_READ) && \
47
+
((unsigned long) (addr) >= FIXADDR_USER_START) && \
48
+
((unsigned long) (addr) + (size) <= FIXADDR_USER_END) && \
49
+
((unsigned long) (addr) + (size) >= (unsigned long)(addr)))
50
+
51
+
#define __addr_range_nowrap(addr, size) \
52
+
((unsigned long) (addr) <= ((unsigned long) (addr) + (size)))
53
+
54
+
#define access_ok(type, addr, size) \
55
+
(__addr_range_nowrap(addr, size) && \
56
+
(__under_task_size(addr, size) || \
57
+
__access_ok_vsyscall(type, addr, size) || \
58
+
segment_eq(get_fs(), KERNEL_DS)))
59
+
60
+
extern int copy_from_user(void *to, const void __user *from, int n);
61
+
extern int copy_to_user(void __user *to, const void *from, int n);
62
+
63
+
/*
64
+
* strncpy_from_user: - Copy a NUL terminated string from userspace.
65
+
* @dst: Destination address, in kernel space. This buffer must be at
66
+
* least @count bytes long.
67
+
* @src: Source address, in user space.
68
+
* @count: Maximum number of bytes to copy, including the trailing NUL.
69
+
*
70
+
* Copies a NUL-terminated string from userspace to kernel space.
71
+
*
72
+
* On success, returns the length of the string (not including the trailing
73
+
* NUL).
74
+
*
75
+
* If access to userspace fails, returns -EFAULT (some data may have been
76
+
* copied).
77
+
*
78
+
* If @count is smaller than the length of the string, copies @count bytes
79
+
* and returns @count.
80
+
*/
81
+
82
+
extern int strncpy_from_user(char *dst, const char __user *src, int count);
83
+
84
+
/*
85
+
* __clear_user: - Zero a block of memory in user space, with less checking.
86
+
* @to: Destination address, in user space.
87
+
* @n: Number of bytes to zero.
88
+
*
89
+
* Zero a block of memory in user space. Caller must check
90
+
* the specified block with access_ok() before calling this function.
91
+
*
92
+
* Returns number of bytes that could not be cleared.
93
+
* On success, this will be zero.
94
+
*/
95
+
extern int __clear_user(void __user *mem, int len);
96
+
97
+
/*
98
+
* clear_user: - Zero a block of memory in user space.
99
+
* @to: Destination address, in user space.
100
+
* @n: Number of bytes to zero.
101
+
*
102
+
* Zero a block of memory in user space.
103
+
*
104
+
* Returns number of bytes that could not be cleared.
105
+
* On success, this will be zero.
106
+
*/
107
+
extern int clear_user(void __user *mem, int len);
108
+
109
+
/*
110
+
* strlen_user: - Get the size of a string in user space.
111
+
* @str: The string to measure.
112
+
* @n: The maximum valid length
113
+
*
114
+
* Get the size of a NUL-terminated string in user space.
115
+
*
116
+
* Returns the size of the string INCLUDING the terminating NUL.
117
+
* On exception, returns 0.
118
+
* If the string is too long, returns a value greater than @n.
119
+
*/
120
+
extern int strnlen_user(const void __user *str, int len);
42
121
43
122
#define __copy_from_user(to, from, n) copy_from_user(to, from, n)
44
123