Commit 0465b9fb authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Fix get_user()/put_user() build error. 



Fixes the build error caused by -Werror on gcc 3.x compilers:

arch/sh/kernel/signal_32.c: In function `sys_sigaction':
arch/sh/kernel/signal_32.c:66: warning: initialization discards qualifiers from pointer target type
arch/sh/kernel/signal_32.c:67: warning: initialization discards qualifiers from pointer target type
arch/sh/kernel/signal_32.c:69: warning: initialization discards qualifiers from pointer target type
arch/sh/kernel/signal_32.c:70: warning: initialization discards qualifiers from pointer target type

The mismatch in question was introduced by commit-id
9c5a4eec79b3eb8876d2e7fddfa1e040a7650e55.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 31a49c4b

include/asm-sh/uaccess_32.h

+28 −36
Original line number Diff line number Diff line
@@ -95,11 +95,9 @@ static inline int __access_ok(unsigned long addr, unsigned long size) 
}

#endif /* CONFIG_MMU */



static inline int access_ok(int type, const void __user *p, unsigned long size)

{

	unsigned long addr = (unsigned long)p;

	return __access_ok(addr, size);

}

#define access_ok(type, addr, size)	\

	(__chk_user_ptr(addr),		\

	 __access_ok((unsigned long __force)(addr), (size)))



/*

 * Uh, these should become the main single-value transfer routines ...
@@ -121,10 +119,8 @@ static inline int access_ok(int type, const void __user *p, unsigned long size) 
 * doing multiple accesses to the same area (the user has to do the

 * checks by hand with "access_ok()")

 */

#define __put_user(x,ptr) \

  __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))

#define __get_user(x,ptr) \

  __get_user_nocheck((x),(ptr),sizeof(*(ptr)))

#define __put_user(x,ptr)	__put_user_nocheck((x), (ptr), sizeof(*(ptr)))

#define __get_user(x,ptr)	__get_user_nocheck((x), (ptr), sizeof(*(ptr)))



struct __large_struct { unsigned long buf[100]; };

#define __m(x) (*(struct __large_struct __user *)(x))
@@ -132,7 +128,6 @@ struct __large_struct { unsigned long buf[100]; }; 
#define __get_user_size(x,ptr,size,retval)			\

do {								\

	retval = 0;						\

	__chk_user_ptr(ptr);					\

	switch (size) {						\

	case 1:							\

		__get_user_asm(x, ptr, retval, "b");		\
@@ -151,24 +146,22 @@ do { \ 


#define __get_user_nocheck(x,ptr,size)				\

({								\

	long __gu_err, __gu_val;				\

	__typeof__(*(ptr)) *__pu_addr = (ptr);  \

	__get_user_size(__gu_val, (__pu_addr), (size), __gu_err);	\

	long __gu_err;						\

	unsigned long __gu_val;					\

	const __typeof__(*(ptr)) __user *__gu_addr = (ptr);	\

	__chk_user_ptr(ptr);					\

	__get_user_size(__gu_val, __gu_addr, (size), __gu_err);	\

	(x) = (__typeof__(*(ptr)))__gu_val;			\

	__gu_err;						\

})



#define __get_user_check(x,ptr,size)					\

({									\

	long __gu_err, __gu_val;					\

	__typeof__(*(ptr)) *__pu_addr = (ptr);				\

	__chk_user_ptr(__pu_addr);					\

	if (likely(__addr_ok((unsigned long)(__pu_addr)))) {		\

		__get_user_size(__gu_val, (__pu_addr), (size), __gu_err);\

	} else {							\

		__gu_err = -EFAULT;					\

		__gu_val = 0;						\

	}								\

	long __gu_err = -EFAULT;					\

	unsigned long __gu_val = 0;					\

	const __typeof__(*(ptr)) *__gu_addr = (ptr);			\

	if (likely(access_ok(VERIFY_READ, __gu_addr, (size))))		\

		__get_user_size(__gu_val, __gu_addr, (size), __gu_err);	\

	(x) = (__typeof__(*(ptr)))__gu_val;				\

	__gu_err;							\

})
@@ -199,7 +192,6 @@ extern void __get_user_unknown(void); 
#define __put_user_size(x,ptr,size,retval)		\

do {							\

	retval = 0;					\

	__chk_user_ptr(ptr);				\

	switch (size) {					\

	case 1:						\

		__put_user_asm(x, ptr, retval, "b");	\
@@ -221,19 +213,19 @@ do { \ 
#define __put_user_nocheck(x,ptr,size)				\

({								\

	long __pu_err;						\

	__put_user_size((x),(ptr),(size),__pu_err);	\

	__typeof__(*(ptr)) __user *__pu_addr = (ptr);		\

	__chk_user_ptr(ptr);					\

	__put_user_size((x), __pu_addr, (size), __pu_err);	\

	__pu_err;						\

})



#define __put_user_check(x,ptr,size)				\

({								\

	long __pu_err;						\

	long __pu_err = -EFAULT;				\

	__typeof__(*(ptr)) __user *__pu_addr = (ptr);		\

								\

	if (likely(__addr_ok((unsigned long)__pu_addr)))	\

		__put_user_size((x),__pu_addr,(size),__pu_err);	\

	else							\

		__pu_err = -EFAULT;				\

	if (likely(access_ok(VERIFY_WRITE, __pu_addr, size)))	\

		__put_user_size((x), __pu_addr, (size),		\

				__pu_err);			\

	__pu_err;						\

})

CRA Git | Maintained and supported by SUSTech CRA and CCSE