tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] m68k: basic __user annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Al Viro and committed by Linus Torvalds 11c40f8a ad9ec4f8

+10 -8
unified split
+10 -8
include/asm-m68k/uaccess.h
··· 42 42 ({ \ 43 43 int __pu_err; \ 44 44 typeof(*(ptr)) __pu_val = (x); \ 45 + __chk_user_ptr(ptr); \ 45 46 switch (sizeof (*(ptr))) { \ 46 47 case 1: \ 47 48 __put_user_asm(__pu_err, __pu_val, ptr, b); \ ··· 92 91 ({ \ 93 92 int __gu_err; \ 94 93 typeof(*(ptr)) __gu_val; \ 94 + __chk_user_ptr(ptr); \ 95 95 switch (sizeof(*(ptr))) { \ 96 96 case 1: \ 97 97 __get_user_asm(__gu_err, __gu_val, ptr, b, "=d"); \ ··· 107 105 __gu_err = __constant_copy_from_user(&__gu_val, ptr, 8); \ 108 106 break; \ 109 107 default: \ 110 - __gu_val = 0; \ 108 + __gu_val = (typeof(*(ptr)))0; \ 111 109 __gu_err = __get_user_bad(); \ 112 110 break; \ 113 111 } \ ··· 136 134 : "m"(*(ptr)), "i" (-EFAULT), "0"(0)) 137 135 138 136 static inline unsigned long 139 - __generic_copy_from_user(void *to, const void *from, unsigned long n) 137 + __generic_copy_from_user(void *to, const void __user *from, unsigned long n) 140 138 { 141 139 unsigned long tmp; 142 140 __asm__ __volatile__ ··· 191 189 } 192 190 193 191 static inline unsigned long 194 - __generic_copy_to_user(void *to, const void *from, unsigned long n) 192 + __generic_copy_to_user(void __user *to, const void *from, unsigned long n) 195 193 { 196 194 unsigned long tmp; 197 195 __asm__ __volatile__ ··· 266 264 : "d0", "memory") 267 265 268 266 static inline unsigned long 269 - __constant_copy_from_user(void *to, const void *from, unsigned long n) 267 + __constant_copy_from_user(void *to, const void __user *from, unsigned long n) 270 268 { 271 269 switch (n) { 272 270 case 0: ··· 522 520 #define __copy_from_user_inatomic __copy_from_user 523 521 524 522 static inline unsigned long 525 - __constant_copy_to_user(void *to, const void *from, unsigned long n) 523 + __constant_copy_to_user(void __user *to, const void *from, unsigned long n) 526 524 { 527 525 switch (n) { 528 526 case 0: ··· 768 766 */ 769 767 770 768 static inline long 771 - strncpy_from_user(char *dst, const char *src, long count) 769 + strncpy_from_user(char *dst, const char __user *src, long count) 772 770 { 773 771 long res; 774 772 if (count == 0) return count; ··· 801 799 * 802 800 * Return 0 on exception, a value greater than N if too long 803 801 */ 804 - static inline long strnlen_user(const char *src, long n) 802 + static inline long strnlen_user(const char __user *src, long n) 805 803 { 806 804 long res; 807 805 ··· 844 842 */ 845 843 846 844 static inline unsigned long 847 - clear_user(void *to, unsigned long n) 845 + clear_user(void __user *to, unsigned long n) 848 846 { 849 847 __asm__ __volatile__ 850 848 (" tstl %1\n"