From 265694b7eca2de291c9d8a9aeb1fe8da1a6e3745 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Wed, 16 Oct 2019 16:05:34 -0700 Subject: [PATCH] ANDROID: Four part re-add of asm-goto usage [3/4] Re-add "x86/uaccess: Don't leak the AC flag into __put_user() value evaluation" This reverts commit a4bd9e975e0ea28242401200a4c2fd618aa2be9d. Bug: 120440614 Bug: 132629930 Signed-off-by: Ram Muthiah Change-Id: Iebfe5df8e2e09b6eeeaae343ec6deeda7f45c975 --- arch/x86/include/asm/uaccess.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 8fc40674c174..176c73385605 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -282,7 +282,7 @@ do { \ __put_user_goto(x, ptr, "l", "k", "ir", label); \ break; \ case 8: \ - __put_user_goto_u64((__typeof__(*ptr))(x), ptr, label); \ + __put_user_goto_u64(x, ptr, label); \ break; \ default: \ __put_user_bad(); \ @@ -429,8 +429,10 @@ do { \ ({ \ __label__ __pu_label; \ int __pu_err = -EFAULT; \ + __typeof__(*(ptr)) __pu_val; \ + __pu_val = x; \ __uaccess_begin(); \ - __put_user_size((x), (ptr), (size), __pu_label); \ + __put_user_size(__pu_val, (ptr), (size), __pu_label); \ __pu_err = 0; \ __pu_label: \ __uaccess_end(); \