x86/uaccess: Don't leak the AC flag into __put_user() value evaluation

When calling __put_user(foo(), ptr), the __put_user() macro would call
foo() in between __uaccess_begin() and __uaccess_end(). If that code
were buggy, then those bugs would be run without SMAP protection.

Fortunately, there seem to be few instances of the problem in the
kernel. Nevertheless, __put_user() should be fixed to avoid doing this.
Therefore, evaluate __put_user()'s argument before setting AC.

This issue was noticed when an objtool hack by Peter Zijlstra complained
about genregs_get() and I compared the assembly output to the C source.

[ bp: Massage commit message and fixed up whitespace. ]

Fixes: 11f1a4b9755f ("x86: reorganize SMAP handling in user space accesses")
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/20190225125231.845656645@infradead.org

authored by Andy Lutomirski and committed by Borislav Petkov 2a418cf3 f331e766

Changed files
+4 -2
arch
x86
include
asm
+4 -2
arch/x86/include/asm/uaccess.h
··· 284 284 __put_user_goto(x, ptr, "l", "k", "ir", label); \ 285 285 break; \ 286 286 case 8: \ 287 - __put_user_goto_u64((__typeof__(*ptr))(x), ptr, label); \ 287 + __put_user_goto_u64(x, ptr, label); \ 288 288 break; \ 289 289 default: \ 290 290 __put_user_bad(); \ ··· 431 431 ({ \ 432 432 __label__ __pu_label; \ 433 433 int __pu_err = -EFAULT; \ 434 + __typeof__(*(ptr)) __pu_val; \ 435 + __pu_val = x; \ 434 436 __uaccess_begin(); \ 435 - __put_user_size((x), (ptr), (size), __pu_label); \ 437 + __put_user_size(__pu_val, (ptr), (size), __pu_label); \ 436 438 __pu_err = 0; \ 437 439 __pu_label: \ 438 440 __uaccess_end(); \