Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a716174 authored by Ram Muthiah's avatar Ram Muthiah
Browse files

ANDROID: Four part revert of asm-goto usage [3/4] 



Revert "Use __put_user_goto in __put_user_size() and unsafe_put_user()"
This reverts commit a959dc88.

Bug: 120440614
Bug: 132629930
Change-Id: I07410ed2bc7552f16ec119fbc2001bb43ffef6f4
Signed-off-by: default avatarRam Muthiah <rammuthiah@google.com>
parent a4bd9e97

arch/x86/include/asm/uaccess.h

+33 −24
Original line number Diff line number Diff line
@@ -182,14 +182,19 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) 




#ifdef CONFIG_X86_32

#define __put_user_goto_u64(x, addr, label)			\

	asm_volatile_goto("\n"					\

		     "1:	movl %%eax,0(%1)\n"		\

		     "2:	movl %%edx,4(%1)\n"		\

		     _ASM_EXTABLE_UA(1b, %l2)			\

		     _ASM_EXTABLE_UA(2b, %l2)			\

		     : : "A" (x), "r" (addr)			\

		     : : label)

#define __put_user_asm_u64(x, addr, err, errret)			\

	asm volatile("\n"						\

		     "1:	movl %%eax,0(%2)\n"			\

		     "2:	movl %%edx,4(%2)\n"			\

		     "3:"						\

		     ".section .fixup,\"ax\"\n"				\

		     "4:	movl %3,%0\n"				\

		     "	jmp 3b\n"					\

		     ".previous\n"					\

		     _ASM_EXTABLE_UA(1b, 4b)				\

		     _ASM_EXTABLE_UA(2b, 4b)				\

		     : "=r" (err)					\

		     : "A" (x), "r" (addr), "i" (errret), "0" (err))



#define __put_user_asm_ex_u64(x, addr)					\

	asm volatile("\n"						\
@@ -204,8 +209,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) 
	asm volatile("call __put_user_8" : "=a" (__ret_pu)	\

		     : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")

#else

#define __put_user_goto_u64(x, ptr, label) \

	__put_user_goto(x, ptr, "q", "", "er", label)

#define __put_user_asm_u64(x, ptr, retval, errret) \

	__put_user_asm(x, ptr, retval, "q", "", "er", errret)

#define __put_user_asm_ex_u64(x, addr)	\

	__put_user_asm_ex(x, addr, "q", "", "er")

#define __put_user_x8(x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu)
@@ -266,21 +271,23 @@ extern void __put_user_8(void); 
	__builtin_expect(__ret_pu, 0);				\

})



#define __put_user_size(x, ptr, size, label)				\

#define __put_user_size(x, ptr, size, retval, errret)			\

do {									\

	retval = 0;							\

	__chk_user_ptr(ptr);						\

	switch (size) {							\

	case 1:								\

		__put_user_goto(x, ptr, "b", "b", "iq", label);	\

		__put_user_asm(x, ptr, retval, "b", "b", "iq", errret);	\

		break;							\

	case 2:								\

		__put_user_goto(x, ptr, "w", "w", "ir", label);		\

		__put_user_asm(x, ptr, retval, "w", "w", "ir", errret);	\

		break;							\

	case 4:								\

		__put_user_goto(x, ptr, "l", "k", "ir", label);		\

		__put_user_asm(x, ptr, retval, "l", "k", "ir", errret);	\

		break;							\

	case 8:								\

		__put_user_goto_u64((__typeof__(*ptr))(x), ptr, label);	\

		__put_user_asm_u64((__typeof__(*ptr))(x), ptr, retval,	\

				   errret);				\

		break;							\

	default:							\

		__put_user_bad();					\
@@ -425,12 +432,9 @@ do { \ 


#define __put_user_nocheck(x, ptr, size)			\

({								\

	__label__ __pu_label;					\

	int __pu_err = -EFAULT;					\

	int __pu_err;						\

	__uaccess_begin();					\

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

	__pu_err = 0;						\

__pu_label:							\

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

	__uaccess_end();					\

	__builtin_expect(__pu_err, 0);				\

})
@@ -715,8 +719,13 @@ static __must_check __always_inline bool user_access_begin(const void __user *pt 
#define user_access_save()     smap_save()

#define user_access_restore(x) smap_restore(x)



#define unsafe_put_user(x, ptr, label)	\

	__put_user_size((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)), label)

#define unsafe_put_user(x, ptr, err_label)					\

do {										\

	int __pu_err;								\

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

	__put_user_size(__pu_val, (ptr), sizeof(*(ptr)), __pu_err, -EFAULT);	\

	if (unlikely(__pu_err)) goto err_label;					\

} while (0)



#define unsafe_get_user(x, ptr, err_label)					\

do {										\