Patch "x86/selftests: Add clobbers for int80 on x86_64" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86/selftests: Add clobbers for int80 on x86_64
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-selftests-add-clobbers-for-int80-on-x86_64.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Tue Dec 12 13:26:17 CET 2017
From: Dmitry Safonov <[email protected]>
Date: Mon, 13 Feb 2017 13:13:36 +0300
Subject: x86/selftests: Add clobbers for int80 on x86_64
From: Dmitry Safonov <[email protected]>
[ Upstream commit 2a4d0c627f5374f365a873dea4e10ae0bb437680 ]
Kernel erases R8..R11 registers prior returning to userspace from int80:
https://lkml.org/lkml/2009/10/1/164
GCC can reuse these registers and doesn't expect them to change during syscall invocation. I met this kind of bug in CRIU once GCC 6.1 and CLANG stored local variables in those registers and the kernel zerofied them during syscall:
https://github.com/xemul/criu/commit/990d33f1a1cdd17bca6c2eb059ab3be2564f7fa2
By that reason I suggest to add those registers to clobbers in selftests. Also, as noted by Andy - removed unneeded clobber for flags in INT $0x80 inline asm.
--- tools/testing/selftests/x86/fsgsbase.c | 2 +- tools/testing/selftests/x86/ldt_gdt.c | 16 +++++++++++----- tools/testing/selftests/x86/ptrace_syscall.c | 3 ++- tools/testing/selftests/x86/single_step_syscall.c | 5 ++++- 4 files changed, 18 insertions(+), 8 deletions(-)
tools/testing/selftests/x86/fsgsbase.c +1 -1
@@ -245,7 +245,7 @@ void do_unexpected_base(void)long ret; asmvolatile ("int $0x80" :"=a" (ret) :"a" (243 ),"b" (low_desc) - :"flags" ); + :"r8" ,"r9" ,"r10" ,"r11" );memcpy (&desc, low_desc,sizeof (desc));munmap (low_desc,sizeof (desc));
tools/testing/selftests/x86/ldt_gdt.c +11 -5
@@ -45,6 +45,12 @@#define AR_DB (1 << 22)#define AR_G (1 << 23) +#ifdef __x86_64__ +# define INT80_CLOBBERS "r8", "r9", "r10", "r11" +#else +# define INT80_CLOBBERS +#endif +static int nerrs;/* Points to an array of 1024 ints, each holding its own index. */
@@ -649,7 +655,7 @@ static int invoke_set_thread_area(void) asmvolatile ("int $0x80" :"=a" (ret),"+m" (low_user_desc) :"a" (243 ),"b" (low_user_desc) - :"flags" ); + : INT80_CLOBBERS);return ret; }
@@ -718,7 +724,7 @@ static void test_gdt_invalidation(void) "+a" (eax) : "m" (low_user_desc_clear), [arg1] "r" ((unsigned int)(unsigned long)low_user_desc_clear) - : "flags"); + : INT80_CLOBBERS);if (sel !=0 ) { result ="FAIL" ;
@@ -749,7 +755,7 @@ static void test_gdt_invalidation(void) "+a" (eax) : "m" (low_user_desc_clear), [arg1] "r" ((unsigned int)(unsigned long)low_user_desc_clear) - : "flags"); + : INT80_CLOBBERS);if (sel !=0 ) { result ="FAIL" ;
@@ -782,7 +788,7 @@ static void test_gdt_invalidation(void) "+a" (eax) : "m" (low_user_desc_clear), [arg1] "r" ((unsigned int)(unsigned long)low_user_desc_clear) - : "flags"); + : INT80_CLOBBERS);#ifdef __x86_64__syscall (SYS_arch_prctl,ARCH_GET_FS , &new_base);
@@ -835,7 +841,7 @@ static void test_gdt_invalidation(void) "+a" (eax) : "m" (low_user_desc_clear), [arg1] "r" ((unsigned int)(unsigned long)low_user_desc_clear) - : "flags"); + : INT80_CLOBBERS);#ifdef __x86_64__syscall (SYS_arch_prctl,ARCH_GET_GS , &new_base);
tools/testing/selftests/x86/ptrace_syscall.c +2 -1
@@ -58,7 +58,8 @@ static void do_full_int80(struct syscall asmvolatile ("int $0x80" :"+a" (args->nr),"+b" (args->arg0),"+c" (args->arg1),"+d" (args->arg2), -"+S" (args->arg3),"+D" (args->arg4),"+r" (bp)); +"+S" (args->arg3),"+D" (args->arg4),"+r" (bp) + : :"r8" ,"r9" ,"r10" ,"r11" ); args->arg5 = bp;#else sys32_helper (args, int80_and_ret);
tools/testing/selftests/x86/single_step_syscall.c +4 -1
@@ -56,9 +56,11 @@ static volatile sig_atomic_t sig_traps;#ifdef __x86_64__# define REG_IP REG_RIP# define WIDTH "q" +# define INT80_CLOBBERS "r8", "r9", "r10", "r11"#else # define REG_IP REG_EIP# define WIDTH "l" +# define INT80_CLOBBERS #endif static unsigned long get_eflags (void )
@@ -140,7 +142,8 @@ int main()printf ("[RUN]\tSet TF and check int80\n" );set_eflags (get_eflags () |X86_EFLAGS_TF ); - asmvolatile ("int $0x80" :"=a" (tmp) :"a" (SYS_getpid)); + asmvolatile ("int $0x80" :"=a" (tmp) :"a" (SYS_getpid) + : INT80_CLOBBERS);check_result ();/*
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/x86-selftests-add-clobbers-for-int80-on-x86_64.patch