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

Commit 2c716485 authored by Ram Muthiah's avatar Ram Muthiah
Browse files

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



Revert "x86/uaccess: Dont leak the AC flag into __put_user() argument evaluation"
This reverts commit 6ae86561.

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

arch/x86/include/asm/uaccess.h

+3 −4
Original line number Diff line number Diff line
@@ -427,11 +427,10 @@ do { \ 
({								\

	__label__ __pu_label;					\

	int __pu_err = -EFAULT;					\

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

	__typeof__(ptr) __pu_ptr = (ptr);			\

	__typeof__(size) __pu_size = (size);			\

	__typeof__(*(ptr)) __pu_val;				\

	__pu_val = x;						\

	__uaccess_begin();					\

	__put_user_size(__pu_val, __pu_ptr, __pu_size, __pu_label);	\

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

	__pu_err = 0;						\

__pu_label:							\

	__uaccess_end();					\