hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d
kernel/arch/alpha/lib/csum_partial_copy.c
....@@ -39,31 +39,17 @@
3939 #define insqh(x,y,z) \
4040 __asm__ __volatile__("insqh %1,%2,%0":"=r" (z):"r" (x),"r" (y))
4141
42
-
43
-#define __get_user_u(x,ptr) \
42
+#define __get_word(insn,x,ptr) \
4443 ({ \
4544 long __guu_err; \
4645 __asm__ __volatile__( \
47
- "1: ldq_u %0,%2\n" \
46
+ "1: "#insn" %0,%2\n" \
4847 "2:\n" \
4948 EXC(1b,2b,%0,%1) \
5049 : "=r"(x), "=r"(__guu_err) \
5150 : "m"(__m(ptr)), "1"(0)); \
5251 __guu_err; \
5352 })
54
-
55
-#define __put_user_u(x,ptr) \
56
-({ \
57
- long __puu_err; \
58
- __asm__ __volatile__( \
59
- "1: stq_u %2,%1\n" \
60
- "2:\n" \
61
- EXC(1b,2b,$31,%0) \
62
- : "=r"(__puu_err) \
63
- : "m"(__m(addr)), "rJ"(x), "0"(0)); \
64
- __puu_err; \
65
-})
66
-
6753
6854 static inline unsigned short from64to16(unsigned long x)
6955 {
....@@ -95,15 +81,15 @@
9581 */
9682 static inline unsigned long
9783 csum_partial_cfu_aligned(const unsigned long __user *src, unsigned long *dst,
98
- long len, unsigned long checksum,
99
- int *errp)
84
+ long len)
10085 {
86
+ unsigned long checksum = ~0U;
10187 unsigned long carry = 0;
102
- int err = 0;
10388
10489 while (len >= 0) {
10590 unsigned long word;
106
- err |= __get_user(word, src);
91
+ if (__get_word(ldq, word, src))
92
+ return 0;
10793 checksum += carry;
10894 src++;
10995 checksum += word;
....@@ -116,7 +102,8 @@
116102 checksum += carry;
117103 if (len) {
118104 unsigned long word, tmp;
119
- err |= __get_user(word, src);
105
+ if (__get_word(ldq, word, src))
106
+ return 0;
120107 tmp = *dst;
121108 mskql(word, len, word);
122109 checksum += word;
....@@ -125,7 +112,6 @@
125112 *dst = word | tmp;
126113 checksum += carry;
127114 }
128
- if (err && errp) *errp = err;
129115 return checksum;
130116 }
131117
....@@ -137,20 +123,21 @@
137123 csum_partial_cfu_dest_aligned(const unsigned long __user *src,
138124 unsigned long *dst,
139125 unsigned long soff,
140
- long len, unsigned long checksum,
141
- int *errp)
126
+ long len)
142127 {
143128 unsigned long first;
144129 unsigned long word, carry;
145130 unsigned long lastsrc = 7+len+(unsigned long)src;
146
- int err = 0;
131
+ unsigned long checksum = ~0U;
147132
148
- err |= __get_user_u(first,src);
133
+ if (__get_word(ldq_u, first,src))
134
+ return 0;
149135 carry = 0;
150136 while (len >= 0) {
151137 unsigned long second;
152138
153
- err |= __get_user_u(second, src+1);
139
+ if (__get_word(ldq_u, second, src+1))
140
+ return 0;
154141 extql(first, soff, word);
155142 len -= 8;
156143 src++;
....@@ -168,7 +155,8 @@
168155 if (len) {
169156 unsigned long tmp;
170157 unsigned long second;
171
- err |= __get_user_u(second, lastsrc);
158
+ if (__get_word(ldq_u, second, lastsrc))
159
+ return 0;
172160 tmp = *dst;
173161 extql(first, soff, word);
174162 extqh(second, soff, first);
....@@ -180,7 +168,6 @@
180168 *dst = word | tmp;
181169 checksum += carry;
182170 }
183
- if (err && errp) *errp = err;
184171 return checksum;
185172 }
186173
....@@ -191,18 +178,18 @@
191178 csum_partial_cfu_src_aligned(const unsigned long __user *src,
192179 unsigned long *dst,
193180 unsigned long doff,
194
- long len, unsigned long checksum,
195
- unsigned long partial_dest,
196
- int *errp)
181
+ long len,
182
+ unsigned long partial_dest)
197183 {
198184 unsigned long carry = 0;
199185 unsigned long word;
200186 unsigned long second_dest;
201
- int err = 0;
187
+ unsigned long checksum = ~0U;
202188
203189 mskql(partial_dest, doff, partial_dest);
204190 while (len >= 0) {
205
- err |= __get_user(word, src);
191
+ if (__get_word(ldq, word, src))
192
+ return 0;
206193 len -= 8;
207194 insql(word, doff, second_dest);
208195 checksum += carry;
....@@ -216,7 +203,8 @@
216203 len += 8;
217204 if (len) {
218205 checksum += carry;
219
- err |= __get_user(word, src);
206
+ if (__get_word(ldq, word, src))
207
+ return 0;
220208 mskql(word, len, word);
221209 len -= 8;
222210 checksum += word;
....@@ -237,7 +225,6 @@
237225 stq_u(partial_dest | second_dest, dst);
238226 out:
239227 checksum += carry;
240
- if (err && errp) *errp = err;
241228 return checksum;
242229 }
243230
....@@ -249,23 +236,23 @@
249236 csum_partial_cfu_unaligned(const unsigned long __user * src,
250237 unsigned long * dst,
251238 unsigned long soff, unsigned long doff,
252
- long len, unsigned long checksum,
253
- unsigned long partial_dest,
254
- int *errp)
239
+ long len, unsigned long partial_dest)
255240 {
256241 unsigned long carry = 0;
257242 unsigned long first;
258243 unsigned long lastsrc;
259
- int err = 0;
244
+ unsigned long checksum = ~0U;
260245
261
- err |= __get_user_u(first, src);
246
+ if (__get_word(ldq_u, first, src))
247
+ return 0;
262248 lastsrc = 7+len+(unsigned long)src;
263249 mskql(partial_dest, doff, partial_dest);
264250 while (len >= 0) {
265251 unsigned long second, word;
266252 unsigned long second_dest;
267253
268
- err |= __get_user_u(second, src+1);
254
+ if (__get_word(ldq_u, second, src+1))
255
+ return 0;
269256 extql(first, soff, word);
270257 checksum += carry;
271258 len -= 8;
....@@ -286,7 +273,8 @@
286273 unsigned long second, word;
287274 unsigned long second_dest;
288275
289
- err |= __get_user_u(second, lastsrc);
276
+ if (__get_word(ldq_u, second, lastsrc))
277
+ return 0;
290278 extql(first, soff, word);
291279 extqh(second, soff, first);
292280 word |= first;
....@@ -307,7 +295,8 @@
307295 unsigned long second, word;
308296 unsigned long second_dest;
309297
310
- err |= __get_user_u(second, lastsrc);
298
+ if (__get_word(ldq_u, second, lastsrc))
299
+ return 0;
311300 extql(first, soff, word);
312301 extqh(second, soff, first);
313302 word |= first;
....@@ -320,66 +309,55 @@
320309 stq_u(partial_dest | word | second_dest, dst);
321310 checksum += carry;
322311 }
323
- if (err && errp) *errp = err;
324312 return checksum;
325313 }
326314
327
-__wsum
328
-csum_partial_copy_from_user(const void __user *src, void *dst, int len,
329
- __wsum sum, int *errp)
315
+static __wsum __csum_and_copy(const void __user *src, void *dst, int len)
330316 {
331
- unsigned long checksum = (__force u32) sum;
332317 unsigned long soff = 7 & (unsigned long) src;
333318 unsigned long doff = 7 & (unsigned long) dst;
319
+ unsigned long checksum;
334320
335
- if (len) {
336
- if (!access_ok(VERIFY_READ, src, len)) {
337
- if (errp) *errp = -EFAULT;
338
- memset(dst, 0, len);
339
- return sum;
340
- }
341
- if (!doff) {
342
- if (!soff)
343
- checksum = csum_partial_cfu_aligned(
344
- (const unsigned long __user *) src,
345
- (unsigned long *) dst,
346
- len-8, checksum, errp);
347
- else
348
- checksum = csum_partial_cfu_dest_aligned(
349
- (const unsigned long __user *) src,
350
- (unsigned long *) dst,
351
- soff, len-8, checksum, errp);
352
- } else {
353
- unsigned long partial_dest;
354
- ldq_u(partial_dest, dst);
355
- if (!soff)
356
- checksum = csum_partial_cfu_src_aligned(
357
- (const unsigned long __user *) src,
358
- (unsigned long *) dst,
359
- doff, len-8, checksum,
360
- partial_dest, errp);
361
- else
362
- checksum = csum_partial_cfu_unaligned(
363
- (const unsigned long __user *) src,
364
- (unsigned long *) dst,
365
- soff, doff, len-8, checksum,
366
- partial_dest, errp);
367
- }
368
- checksum = from64to16 (checksum);
321
+ if (!doff) {
322
+ if (!soff)
323
+ checksum = csum_partial_cfu_aligned(
324
+ (const unsigned long __user *) src,
325
+ (unsigned long *) dst, len-8);
326
+ else
327
+ checksum = csum_partial_cfu_dest_aligned(
328
+ (const unsigned long __user *) src,
329
+ (unsigned long *) dst,
330
+ soff, len-8);
331
+ } else {
332
+ unsigned long partial_dest;
333
+ ldq_u(partial_dest, dst);
334
+ if (!soff)
335
+ checksum = csum_partial_cfu_src_aligned(
336
+ (const unsigned long __user *) src,
337
+ (unsigned long *) dst,
338
+ doff, len-8, partial_dest);
339
+ else
340
+ checksum = csum_partial_cfu_unaligned(
341
+ (const unsigned long __user *) src,
342
+ (unsigned long *) dst,
343
+ soff, doff, len-8, partial_dest);
369344 }
370
- return (__force __wsum)checksum;
345
+ return (__force __wsum)from64to16 (checksum);
371346 }
372
-EXPORT_SYMBOL(csum_partial_copy_from_user);
373347
374348 __wsum
375
-csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
349
+csum_and_copy_from_user(const void __user *src, void *dst, int len)
376350 {
377
- __wsum checksum;
378
- mm_segment_t oldfs = get_fs();
379
- set_fs(KERNEL_DS);
380
- checksum = csum_partial_copy_from_user((__force const void __user *)src,
381
- dst, len, sum, NULL);
382
- set_fs(oldfs);
383
- return checksum;
351
+ if (!access_ok(src, len))
352
+ return 0;
353
+ return __csum_and_copy(src, dst, len);
354
+}
355
+EXPORT_SYMBOL(csum_and_copy_from_user);
356
+
357
+__wsum
358
+csum_partial_copy_nocheck(const void *src, void *dst, int len)
359
+{
360
+ return __csum_and_copy((__force const void __user *)src,
361
+ dst, len);
384362 }
385363 EXPORT_SYMBOL(csum_partial_copy_nocheck);