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

Commit a4bd9e97 authored by Ram Muthiah's avatar Ram Muthiah
Browse files

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



Revert "x86/uaccess: Don't leak the AC flag into __put_user() value evaluation"
This reverts commit 2a418cf3.

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

arch/x86/include/asm/uaccess.h

+2 −4
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ do { \ 
		__put_user_goto(x, ptr, "l", "k", "ir", label);		\

		break;							\

	case 8:								\

		__put_user_goto_u64(x, ptr, label);			\

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

		break;							\

	default:							\

		__put_user_bad();					\
@@ -427,10 +427,8 @@ do { \ 
({								\

	__label__ __pu_label;					\

	int __pu_err = -EFAULT;					\

	__typeof__(*(ptr)) __pu_val;				\

	__pu_val = x;						\

	__uaccess_begin();					\

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

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

	__pu_err = 0;						\

__pu_label:							\

	__uaccess_end();					\