From 5a7b085e71c0347fee6c094b4c855e2f12582992 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Wed, 16 Oct 2019 16:17:49 -0700 Subject: [PATCH] ANDROID: Four part re-add of asm-goto usage [4/4] Re-add "x86/uaccess: Dont leak the AC flag into __put_user() argument evaluation" This reverts commit 2c7164851ef24079bee51560a19ba10addc453b0. Bug: 120440614 Bug: 132629930 Signed-off-by: Ram Muthiah Change-Id: I74ea8dcb2f5c3661dc1657eb53872375aa9e6753 --- arch/x86/include/asm/uaccess.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 176c73385605..61d93f062a36 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -429,10 +429,11 @@ do { \ ({ \ __label__ __pu_label; \ int __pu_err = -EFAULT; \ - __typeof__(*(ptr)) __pu_val; \ - __pu_val = x; \ + __typeof__(*(ptr)) __pu_val = (x); \ + __typeof__(ptr) __pu_ptr = (ptr); \ + __typeof__(size) __pu_size = (size); \ __uaccess_begin(); \ - __put_user_size(__pu_val, (ptr), (size), __pu_label); \ + __put_user_size(__pu_val, __pu_ptr, __pu_size, __pu_label); \ __pu_err = 0; \ __pu_label: \ __uaccess_end(); \