Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] uml: add missing __volatile__

We were missing __volatile__ on some bits of asm in the segfault handlers.
On x86_64, this was messing up the move from %rdx to uc because that was
moved to after the GET_FAULTINFO_FROM_SC, which changed %rdx.

Also changed the other bit of asm and the one in the i386 handler to
prevent any similar occurrences.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Jeff Dike and committed by
Linus Torvalds
fb30d645 966a082f

+7 -7
+2 -2
arch/um/sys-i386/stub_segv.c
··· 27 27 * the stack in its original form when we do the sigreturn here, by 28 28 * hand. 29 29 */ 30 - __asm__("mov %0,%%esp ; movl %1, %%eax ; " 31 - "int $0x80" : : "a" (sc), "g" (__NR_sigreturn)); 30 + __asm__ __volatile__("mov %0,%%esp ; movl %1, %%eax ; " 31 + "int $0x80" : : "a" (sc), "g" (__NR_sigreturn)); 32 32 }
+5 -5
arch/um/sys-x86_64/stub_segv.c
··· 33 33 struct ucontext *uc; 34 34 int pid; 35 35 36 - __asm__("movq %%rdx, %0" : "=g" (uc) :); 36 + __asm__ __volatile__("movq %%rdx, %0" : "=g" (uc) :); 37 37 GET_FAULTINFO_FROM_SC(*((struct faultinfo *) UML_CONFIG_STUB_DATA), 38 38 &uc->uc_mcontext); 39 39 ··· 44 44 * the signal frame. So, we use the ucontext pointer, which we know 45 45 * already, to get the signal frame pointer, and add 8 to that. 46 46 */ 47 - __asm__("movq %0, %%rsp; movq %1, %%rax ; syscall": : 48 - "g" ((unsigned long) container_of(uc, struct rt_sigframe, 49 - uc) + 8), 50 - "g" (__NR_rt_sigreturn)); 47 + __asm__ __volatile__("movq %0, %%rsp; movq %1, %%rax ; syscall": : 48 + "g" ((unsigned long) 49 + container_of(uc, struct rt_sigframe, uc) + 8), 50 + "g" (__NR_rt_sigreturn)); 51 51 }