diff mbox series

[01/12] x86: Update vfork to pop shadow stack

Message ID 20180721142035.21059-2-hjl.tools@gmail.com
State New
Headers show
Series x86/CET: The last 12 patches to enable Intel CET | expand

Commit Message

H.J. Lu July 21, 2018, 2:20 p.m. UTC 
Since we can't change return address on shadow stack, if shadow stack
is in use, we need to pop shadow stack and jump back to caller directly.

	* sysdeps/unix/sysv/linux/i386/vfork.S (SYSCALL_ERROR_HANDLER):
	Redefine if shadow stack is enabled.
	(SYSCALL_ERROR_LABEL): Likewise.
	(__vfork): Pop shadow stack and jump back to to caller directly
	when shadow stack is in use.
	* sysdeps/unix/sysv/linux/x86_64/vfork.S (SYSCALL_ERROR_HANDLER):
	Redefine if shadow stack is enabled.
	(SYSCALL_ERROR_LABEL): Likewise.
	(__vfork): Pop shadow stack and jump back to to caller directly
	when shadow stack is in use.
---
 sysdeps/unix/sysv/linux/i386/vfork.S   | 54 ++++++++++++++++++++++++++
 sysdeps/unix/sysv/linux/x86_64/vfork.S | 35 +++++++++++++++++
 2 files changed, 89 insertions(+)

Comments

Carlos O'Donell July 24, 2018, 2:47 a.m. UTC | #1 
On 07/21/2018 10:20 AM, H.J. Lu wrote:
> Since we can't change return address on shadow stack, if shadow stack
> is in use, we need to pop shadow stack and jump back to caller directly.
> 
> 	* sysdeps/unix/sysv/linux/i386/vfork.S (SYSCALL_ERROR_HANDLER):
> 	Redefine if shadow stack is enabled.
> 	(SYSCALL_ERROR_LABEL): Likewise.
> 	(__vfork): Pop shadow stack and jump back to to caller directly
> 	when shadow stack is in use.
> 	* sysdeps/unix/sysv/linux/x86_64/vfork.S (SYSCALL_ERROR_HANDLER):
> 	Redefine if shadow stack is enabled.
> 	(SYSCALL_ERROR_LABEL): Likewise.
> 	(__vfork): Pop shadow stack and jump back to to caller directly
> 	when shadow stack is in use.
> ---
>  sysdeps/unix/sysv/linux/i386/vfork.S   | 54 ++++++++++++++++++++++++++
>  sysdeps/unix/sysv/linux/x86_64/vfork.S | 35 +++++++++++++++++
>  2 files changed, 89 insertions(+)

OK with comment suggestion.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
 
> diff --git a/sysdeps/unix/sysv/linux/i386/vfork.S b/sysdeps/unix/sysv/linux/i386/vfork.S
> index 8f40d02d09..a75436157e 100644
> --- a/sysdeps/unix/sysv/linux/i386/vfork.S
> +++ b/sysdeps/unix/sysv/linux/i386/vfork.S
> @@ -21,6 +21,35 @@
>  #include <bits/errno.h>
>  #include <tcb-offsets.h>
>  
> +#if SHSTK_ENABLED
> +/* When shadow stack is in use, we need to pop shadow stack and jump
> +   back to caller directly.   */

Suggest:
/* The shadow stack prevents us from pushing the saved return PC
   onto the stack and returning normally.  Instead we pop the shadow
   stack and return directly.  This is the safest way to return
   and ensures any stack manipulations done by the vfork'd child
   doesn't cause the parent to terminate when CET is enabled.  */

> +# undef SYSCALL_ERROR_HANDLER
> +# ifdef PIC
> +#  define SYSCALL_ERROR_HANDLER				\
> +0:							\
> +  calll .L1;						\
> +.L1:							\
> +  popl %edx;						\
> +.L2:							\
> +  addl $_GLOBAL_OFFSET_TABLE_ + (.L2 - .L1), %edx;	\
> +  movl __libc_errno@gotntpoff(%edx), %edx;		\
> +  negl %eax;						\
> +  movl %eax, %gs:(%edx);				\
> +  orl $-1, %eax;					\
> +  jmp 1b;
> +# else
> +#  define SYSCALL_ERROR_HANDLER				\
> +0:							\
> +  movl __libc_errno@indntpoff, %edx;			\
> +  negl %eax;						\
> +  movl %eax, %gs:(%edx);				\
> +  orl $-1, %eax;					\
> +  jmp 1b;
> +# endif
> +# undef SYSCALL_ERROR_LABEL
> +# define SYSCALL_ERROR_LABEL 0f
> +#endif
>  
>  /* Clone the calling process, but without copying the whole address space.
>     The calling process is suspended until the new process exits or is
> @@ -38,16 +67,41 @@ ENTRY (__vfork)
>  	movl	$SYS_ify (vfork), %eax
>  	int	$0x80
>  
> +#if !SHSTK_ENABLED
>  	/* Jump to the return PC.  Don't jump directly since this
>  	   disturbs the branch target cache.  Instead push the return
>  	   address back on the stack.  */
>  	pushl	%ecx
>  	cfi_adjust_cfa_offset (4)
> +#endif

OK.

>  
>  	cmpl	$-4095, %eax
>  	/* Branch forward if it failed.  */
>  	jae	SYSCALL_ERROR_LABEL
>  
> +#if SHSTK_ENABLED
> +1:
> +	/* Check if shadow stack is in use.  */
> +	xorl	%edx, %edx
> +	rdsspd	%edx
> +	testl	%edx, %edx
> +	/* Normal return if shadow stack isn't in use.  */
> +	je	L(no_shstk)

OK.

> +
> +	/* Pop return address from shadow stack and jump back to caller
> +	   directly.  */
> +	movl	$1, %edx
> +	incsspd	%edx
> +	jmp	*%ecx

OK.

> +
> +L(no_shstk):
> +	/* Jump to the return PC.  Don't jump directly since this
> +	   disturbs the branch target cache.  Instead push the return
> +	   address back on the stack.  */
> +	pushl	%ecx
> +	cfi_adjust_cfa_offset (4)
> +#endif
> +
>  	ret
>  
>  PSEUDO_END (__vfork)
> diff --git a/sysdeps/unix/sysv/linux/x86_64/vfork.S b/sysdeps/unix/sysv/linux/x86_64/vfork.S
> index e4c8269e3d..a6d6280bd2 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/vfork.S
> +++ b/sysdeps/unix/sysv/linux/x86_64/vfork.S
> @@ -20,6 +20,18 @@
>  #include <bits/errno.h>
>  #include <tcb-offsets.h>
>  
> +#if SHSTK_ENABLED
> +/* When shadow stack is in use, we need to pop shadow stack and jump
> +   back to caller directly.   */

Likewise.

> +# undef SYSCALL_ERROR_HANDLER
> +# define SYSCALL_ERROR_HANDLER			\
> +0:						\
> +  SYSCALL_SET_ERRNO;				\
> +  or $-1, %RAX_LP;				\
> +  jmp 1b;
> +# undef SYSCALL_ERROR_LABEL
> +# define SYSCALL_ERROR_LABEL 0f
> +#endif
>  
>  /* Clone the calling process, but without copying the whole address space.
>     The calling process is suspended until the new process exits or is
> @@ -38,13 +50,36 @@ ENTRY (__vfork)
>  	movl	$SYS_ify (vfork), %eax
>  	syscall
>  
> +#if !SHSTK_ENABLED
>  	/* Push back the return PC.  */
>  	pushq	%rdi
>  	cfi_adjust_cfa_offset(8)
> +#endif
>  
>  	cmpl	$-4095, %eax
>  	jae SYSCALL_ERROR_LABEL		/* Branch forward if it failed.  */
>  
> +#if SHSTK_ENABLED
> +1:
> +	/* Check if shadow stack is in use.  */
> +	xorl	%esi, %esi
> +	rdsspq	%rsi
> +	testq	%rsi, %rsi
> +	/* Normal return if shadow stack isn't in use.  */
> +	je	L(no_shstk)

OK.

> +
> +	/* Pop return address from shadow stack and jump back to caller
> +	   directly.  */
> +	movl	$1, %esi
> +	incsspq	%rsi
> +	jmp	*%rdi
> +
> +L(no_shstk):
> +	/* Push back the return PC.  */
> +	pushq	%rdi
> +	cfi_adjust_cfa_offset(8)
> +#endif
> +

OK.

>  	/* Normal return.  */
>  	ret
>  
>
H.J. Lu July 24, 2018, 12:25 p.m. UTC | #2 
On Mon, Jul 23, 2018 at 7:47 PM, Carlos O'Donell <carlos@redhat.com> wrote:
> On 07/21/2018 10:20 AM, H.J. Lu wrote:
>> Since we can't change return address on shadow stack, if shadow stack
>> is in use, we need to pop shadow stack and jump back to caller directly.
>>
>>       * sysdeps/unix/sysv/linux/i386/vfork.S (SYSCALL_ERROR_HANDLER):
>>       Redefine if shadow stack is enabled.
>>       (SYSCALL_ERROR_LABEL): Likewise.
>>       (__vfork): Pop shadow stack and jump back to to caller directly
>>       when shadow stack is in use.
>>       * sysdeps/unix/sysv/linux/x86_64/vfork.S (SYSCALL_ERROR_HANDLER):
>>       Redefine if shadow stack is enabled.
>>       (SYSCALL_ERROR_LABEL): Likewise.
>>       (__vfork): Pop shadow stack and jump back to to caller directly
>>       when shadow stack is in use.
>> ---
>>  sysdeps/unix/sysv/linux/i386/vfork.S   | 54 ++++++++++++++++++++++++++
>>  sysdeps/unix/sysv/linux/x86_64/vfork.S | 35 +++++++++++++++++
>>  2 files changed, 89 insertions(+)
>
> OK with comment suggestion.
>
> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
>

This is what I checked in.

Thanks.
Carlos O'Donell July 24, 2018, 12:32 p.m. UTC | #3 
On 07/24/2018 08:25 AM, H.J. Lu wrote:
> On Mon, Jul 23, 2018 at 7:47 PM, Carlos O'Donell <carlos@redhat.com> wrote:
>> On 07/21/2018 10:20 AM, H.J. Lu wrote:
>>> Since we can't change return address on shadow stack, if shadow stack
>>> is in use, we need to pop shadow stack and jump back to caller directly.
>>>
>>>       * sysdeps/unix/sysv/linux/i386/vfork.S (SYSCALL_ERROR_HANDLER):
>>>       Redefine if shadow stack is enabled.
>>>       (SYSCALL_ERROR_LABEL): Likewise.
>>>       (__vfork): Pop shadow stack and jump back to to caller directly
>>>       when shadow stack is in use.
>>>       * sysdeps/unix/sysv/linux/x86_64/vfork.S (SYSCALL_ERROR_HANDLER):
>>>       Redefine if shadow stack is enabled.
>>>       (SYSCALL_ERROR_LABEL): Likewise.
>>>       (__vfork): Pop shadow stack and jump back to to caller directly
>>>       when shadow stack is in use.
>>> ---
>>>  sysdeps/unix/sysv/linux/i386/vfork.S   | 54 ++++++++++++++++++++++++++
>>>  sysdeps/unix/sysv/linux/x86_64/vfork.S | 35 +++++++++++++++++
>>>  2 files changed, 89 insertions(+)
>>
>> OK with comment suggestion.
>>
>> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
>>
> 
> This is what I checked in.
> 
> Thanks.
> 

Wrong patch?

c.
H.J. Lu July 24, 2018, 1:17 p.m. UTC | #4 
On Tue, Jul 24, 2018 at 5:32 AM, Carlos O'Donell <carlos@redhat.com> wrote:
> On 07/24/2018 08:25 AM, H.J. Lu wrote:
>> On Mon, Jul 23, 2018 at 7:47 PM, Carlos O'Donell <carlos@redhat.com> wrote:
>>> On 07/21/2018 10:20 AM, H.J. Lu wrote:
>>>> Since we can't change return address on shadow stack, if shadow stack
>>>> is in use, we need to pop shadow stack and jump back to caller directly.
>>>>
>>>>       * sysdeps/unix/sysv/linux/i386/vfork.S (SYSCALL_ERROR_HANDLER):
>>>>       Redefine if shadow stack is enabled.
>>>>       (SYSCALL_ERROR_LABEL): Likewise.
>>>>       (__vfork): Pop shadow stack and jump back to to caller directly
>>>>       when shadow stack is in use.
>>>>       * sysdeps/unix/sysv/linux/x86_64/vfork.S (SYSCALL_ERROR_HANDLER):
>>>>       Redefine if shadow stack is enabled.
>>>>       (SYSCALL_ERROR_LABEL): Likewise.
>>>>       (__vfork): Pop shadow stack and jump back to to caller directly
>>>>       when shadow stack is in use.
>>>> ---
>>>>  sysdeps/unix/sysv/linux/i386/vfork.S   | 54 ++++++++++++++++++++++++++
>>>>  sysdeps/unix/sysv/linux/x86_64/vfork.S | 35 +++++++++++++++++
>>>>  2 files changed, 89 insertions(+)
>>>
>>> OK with comment suggestion.
>>>
>>> Reviewed-by: Carlos O'Donell <carlos@redhat.com>
>>>
>>
>> This is what I checked in.
>>
>> Thanks.
>>
>
> Wrong patch?
>

Oops.  Here is the right one.
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/i386/vfork.S b/sysdeps/unix/sysv/linux/i386/vfork.S
index 8f40d02d09..a75436157e 100644
--- a/sysdeps/unix/sysv/linux/i386/vfork.S
+++ b/sysdeps/unix/sysv/linux/i386/vfork.S
@@ -21,6 +21,35 @@ 
 #include <bits/errno.h>
 #include <tcb-offsets.h>
 
+#if SHSTK_ENABLED
+/* When shadow stack is in use, we need to pop shadow stack and jump
+   back to caller directly.   */
+# undef SYSCALL_ERROR_HANDLER
+# ifdef PIC
+#  define SYSCALL_ERROR_HANDLER				\
+0:							\
+  calll .L1;						\
+.L1:							\
+  popl %edx;						\
+.L2:							\
+  addl $_GLOBAL_OFFSET_TABLE_ + (.L2 - .L1), %edx;	\
+  movl __libc_errno@gotntpoff(%edx), %edx;		\
+  negl %eax;						\
+  movl %eax, %gs:(%edx);				\
+  orl $-1, %eax;					\
+  jmp 1b;
+# else
+#  define SYSCALL_ERROR_HANDLER				\
+0:							\
+  movl __libc_errno@indntpoff, %edx;			\
+  negl %eax;						\
+  movl %eax, %gs:(%edx);				\
+  orl $-1, %eax;					\
+  jmp 1b;
+# endif
+# undef SYSCALL_ERROR_LABEL
+# define SYSCALL_ERROR_LABEL 0f
+#endif
 
 /* Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
@@ -38,16 +67,41 @@  ENTRY (__vfork)
 	movl	$SYS_ify (vfork), %eax
 	int	$0x80
 
+#if !SHSTK_ENABLED
 	/* Jump to the return PC.  Don't jump directly since this
 	   disturbs the branch target cache.  Instead push the return
 	   address back on the stack.  */
 	pushl	%ecx
 	cfi_adjust_cfa_offset (4)
+#endif
 
 	cmpl	$-4095, %eax
 	/* Branch forward if it failed.  */
 	jae	SYSCALL_ERROR_LABEL
 
+#if SHSTK_ENABLED
+1:
+	/* Check if shadow stack is in use.  */
+	xorl	%edx, %edx
+	rdsspd	%edx
+	testl	%edx, %edx
+	/* Normal return if shadow stack isn't in use.  */
+	je	L(no_shstk)
+
+	/* Pop return address from shadow stack and jump back to caller
+	   directly.  */
+	movl	$1, %edx
+	incsspd	%edx
+	jmp	*%ecx
+
+L(no_shstk):
+	/* Jump to the return PC.  Don't jump directly since this
+	   disturbs the branch target cache.  Instead push the return
+	   address back on the stack.  */
+	pushl	%ecx
+	cfi_adjust_cfa_offset (4)
+#endif
+
 	ret
 
 PSEUDO_END (__vfork)
diff --git a/sysdeps/unix/sysv/linux/x86_64/vfork.S b/sysdeps/unix/sysv/linux/x86_64/vfork.S
index e4c8269e3d..a6d6280bd2 100644
--- a/sysdeps/unix/sysv/linux/x86_64/vfork.S
+++ b/sysdeps/unix/sysv/linux/x86_64/vfork.S
@@ -20,6 +20,18 @@ 
 #include <bits/errno.h>
 #include <tcb-offsets.h>
 
+#if SHSTK_ENABLED
+/* When shadow stack is in use, we need to pop shadow stack and jump
+   back to caller directly.   */
+# undef SYSCALL_ERROR_HANDLER
+# define SYSCALL_ERROR_HANDLER			\
+0:						\
+  SYSCALL_SET_ERRNO;				\
+  or $-1, %RAX_LP;				\
+  jmp 1b;
+# undef SYSCALL_ERROR_LABEL
+# define SYSCALL_ERROR_LABEL 0f
+#endif
 
 /* Clone the calling process, but without copying the whole address space.
    The calling process is suspended until the new process exits or is
@@ -38,13 +50,36 @@  ENTRY (__vfork)
 	movl	$SYS_ify (vfork), %eax
 	syscall
 
+#if !SHSTK_ENABLED
 	/* Push back the return PC.  */
 	pushq	%rdi
 	cfi_adjust_cfa_offset(8)
+#endif
 
 	cmpl	$-4095, %eax
 	jae SYSCALL_ERROR_LABEL		/* Branch forward if it failed.  */
 
+#if SHSTK_ENABLED
+1:
+	/* Check if shadow stack is in use.  */
+	xorl	%esi, %esi
+	rdsspq	%rsi
+	testq	%rsi, %rsi
+	/* Normal return if shadow stack isn't in use.  */
+	je	L(no_shstk)
+
+	/* Pop return address from shadow stack and jump back to caller
+	   directly.  */
+	movl	$1, %esi
+	incsspq	%rsi
+	jmp	*%rdi
+
+L(no_shstk):
+	/* Push back the return PC.  */
+	pushq	%rdi
+	cfi_adjust_cfa_offset(8)
+#endif
+
 	/* Normal return.  */
 	ret