.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * linux/net/sunrpc/sysctl.c |
---|
3 | 4 | * |
---|
.. | .. |
---|
59 | 60 | } |
---|
60 | 61 | |
---|
61 | 62 | static int proc_do_xprt(struct ctl_table *table, int write, |
---|
62 | | - void __user *buffer, size_t *lenp, loff_t *ppos) |
---|
| 63 | + void *buffer, size_t *lenp, loff_t *ppos) |
---|
63 | 64 | { |
---|
64 | 65 | char tmpbuf[256]; |
---|
65 | | - size_t len; |
---|
| 66 | + ssize_t len; |
---|
66 | 67 | |
---|
67 | | - if ((*ppos && !write) || !*lenp) { |
---|
| 68 | + if (write || *ppos) { |
---|
68 | 69 | *lenp = 0; |
---|
69 | 70 | return 0; |
---|
70 | 71 | } |
---|
71 | 72 | len = svc_print_xprts(tmpbuf, sizeof(tmpbuf)); |
---|
72 | | - return simple_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len); |
---|
| 73 | + len = memory_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len); |
---|
| 74 | + |
---|
| 75 | + if (len < 0) { |
---|
| 76 | + *lenp = 0; |
---|
| 77 | + return -EINVAL; |
---|
| 78 | + } |
---|
| 79 | + *lenp = len; |
---|
| 80 | + return 0; |
---|
73 | 81 | } |
---|
74 | 82 | |
---|
75 | 83 | static int |
---|
76 | | -proc_dodebug(struct ctl_table *table, int write, |
---|
77 | | - void __user *buffer, size_t *lenp, loff_t *ppos) |
---|
| 84 | +proc_dodebug(struct ctl_table *table, int write, void *buffer, size_t *lenp, |
---|
| 85 | + loff_t *ppos) |
---|
78 | 86 | { |
---|
79 | | - char tmpbuf[20], c, *s = NULL; |
---|
80 | | - char __user *p; |
---|
| 87 | + char tmpbuf[20], *s = NULL; |
---|
| 88 | + char *p; |
---|
81 | 89 | unsigned int value; |
---|
82 | 90 | size_t left, len; |
---|
83 | 91 | |
---|
.. | .. |
---|
89 | 97 | left = *lenp; |
---|
90 | 98 | |
---|
91 | 99 | if (write) { |
---|
92 | | - if (!access_ok(VERIFY_READ, buffer, left)) |
---|
93 | | - return -EFAULT; |
---|
94 | 100 | p = buffer; |
---|
95 | | - while (left && __get_user(c, p) >= 0 && isspace(c)) |
---|
96 | | - left--, p++; |
---|
| 101 | + while (left && isspace(*p)) { |
---|
| 102 | + left--; |
---|
| 103 | + p++; |
---|
| 104 | + } |
---|
97 | 105 | if (!left) |
---|
98 | 106 | goto done; |
---|
99 | 107 | |
---|
100 | 108 | if (left > sizeof(tmpbuf) - 1) |
---|
101 | 109 | return -EINVAL; |
---|
102 | | - if (copy_from_user(tmpbuf, p, left)) |
---|
103 | | - return -EFAULT; |
---|
| 110 | + memcpy(tmpbuf, p, left); |
---|
104 | 111 | tmpbuf[left] = '\0'; |
---|
105 | 112 | |
---|
106 | 113 | value = simple_strtol(tmpbuf, &s, 0); |
---|
.. | .. |
---|
108 | 115 | left -= (s - tmpbuf); |
---|
109 | 116 | if (left && !isspace(*s)) |
---|
110 | 117 | return -EINVAL; |
---|
111 | | - while (left && isspace(*s)) |
---|
112 | | - left--, s++; |
---|
| 118 | + while (left && isspace(*s)) { |
---|
| 119 | + left--; |
---|
| 120 | + s++; |
---|
| 121 | + } |
---|
113 | 122 | } else |
---|
114 | 123 | left = 0; |
---|
115 | 124 | *(unsigned int *) table->data = value; |
---|
.. | .. |
---|
120 | 129 | len = sprintf(tmpbuf, "0x%04x", *(unsigned int *) table->data); |
---|
121 | 130 | if (len > left) |
---|
122 | 131 | len = left; |
---|
123 | | - if (copy_to_user(buffer, tmpbuf, len)) |
---|
124 | | - return -EFAULT; |
---|
| 132 | + memcpy(buffer, tmpbuf, len); |
---|
125 | 133 | if ((left -= len) > 0) { |
---|
126 | | - if (put_user('\n', (char __user *)buffer + len)) |
---|
127 | | - return -EFAULT; |
---|
| 134 | + *((char *)buffer + len) = '\n'; |
---|
128 | 135 | left--; |
---|
129 | 136 | } |
---|
130 | 137 | } |
---|