From a4bd9e975e0ea28242401200a4c2fd618aa2be9d Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Tue, 21 May 2019 18:15:21 -0700 Subject: [PATCH] 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 2a418cf3f5f1caf911af288e978d61c9844b0695. Bug: 120440614 Bug: 132629930 Change-Id: Ib177230b39d1247060f425205d63d65065ed936a Signed-off-by: Ram Muthiah --- arch/x86/include/asm/uaccess.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 22ba683afdc2..8eb4abfe3284 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -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(); \