Skip to contentSkip to conversation

x86/fsgsbase/64: Fix the base write helper functions

PATCH Superseded Chang S. Bae 4 participants 6 messages Nov 16, 2018 – Nov 23, 2018

Subsystems (2)

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 x86/fsgsbase/64: Fix the base write helper functions

The helper functions that purport to write the base should just write it only. It shouldn't have magic optimizations to change the index.

Make the index explicitly changed from the caller, instead of including the code in the helpers.

Subsequently, the task write helpers do not handle for the current task anymore. The range check for a base value is also factored out, to minimize code redundancy from the caller.

v2: Fix further on the task write functions. Revert the changes on the task read helpers.

v3: Fix putreg(). Edit the changelog.

v4: Update the task write helper functions and do_arch_prctl_64(). Fix the comment in putreg().

v5: Fix preempt_disable() calls in do_arch_prctl_64()

Cc Ingo Molnar <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Dave Hansen <[email protected]>
---
 arch/x86/include/asm/fsgsbase.h | 15 ++++--
 arch/x86/kernel/process_64.c    | 86 ++++++++++++++++-----------------
 arch/x86/kernel/ptrace.c        |  9 ++--
 3 files changed, 58 insertions(+), 52 deletions(-)
arch/x86/include/asm/fsgsbase.h +11 -4
index eb377b6e9eed..bca4c743de77 100644
@@ -16,8 +16,8 @@
  */
 extern unsigned long x86_fsbase_read_task(struct task_struct *task);
 extern unsigned long x86_gsbase_read_task(struct task_struct *task);
-extern int x86_fsbase_write_task(struct task_struct *task, unsigned long fsbase);
-extern int x86_gsbase_write_task(struct task_struct *task, unsigned long gsbase);
+extern void x86_fsbase_write_task(struct task_struct *task, unsigned long fsbase);
+extern void x86_gsbase_write_task(struct task_struct *task, unsigned long gsbase);
 
 /* Helper functions for reading/writing FS/GS base */
 
@@ -39,8 +39,15 @@ static inline unsigned long x86_gsbase_read_cpu_inactive(void)
 	return gsbase;
 }
 
-extern void x86_fsbase_write_cpu(unsigned long fsbase);
-extern void x86_gsbase_write_cpu_inactive(unsigned long gsbase);
+static inline void x86_fsbase_write_cpu(unsigned long fsbase)
+{
+	wrmsrl(MSR_FS_BASE, fsbase);
+}
+
+static inline void x86_gsbase_write_cpu_inactive(unsigned long gsbase)
+{
+	wrmsrl(MSR_KERNEL_GS_BASE, gsbase);
+}
 
 #endif /* CONFIG_X86_64 */
 
arch/x86/kernel/process_64.c +42 -44

115 lines not on this page · raw message

arch/x86/kernel/ptrace.c +5 -4
index ffae9b9740fd..4b8ee05dd6ad 100644
@@ -397,11 +397,12 @@ static int putreg(struct task_struct *child,
 		if (value >= TASK_SIZE_MAX)
 			return -EIO;
 		/*
-		 * When changing the FS base, use the same
-		 * mechanism as for do_arch_prctl_64().
+		 * When changing the FS base, use do_arch_prctl_64()
+		 * to set the index to zero and to set the base
+		 * as requested.
 		 */
 		if (child->thread.fsbase != value)
-			return x86_fsbase_write_task(child, value);
+			return do_arch_prctl_64(child, ARCH_SET_FS, value);
 		return 0;
 	case offsetof(struct user_regs_struct,gs_base):
 		/*
@@ -410,7 +411,7 @@ static int putreg(struct task_struct *child,
 		if (value >= TASK_SIZE_MAX)
 			return -EIO;
 		if (child->thread.gsbase != value)
-			return x86_gsbase_write_task(child, value);
+			return do_arch_prctl_64(child, ARCH_SET_GS, value);
 		return 0;
 #endif
 	}
Signature · 1 line
2.19.1
Reviewed-by on v5 1/1
#1 lore raw
Quoted 14 lines · Chang S. Bae

The helper functions that purport to write the base should just write it only. It shouldn't have magic optimizations to change the index.

Make the index explicitly changed from the caller, instead of including the code in the helpers.

Subsequently, the task write helpers do not handle for the current task anymore. The range check for a base value is also factored out, to minimize code redundancy from the caller.

v2: Fix further on the task write functions. Revert the changes on the task read helpers.

Quoted 6 lines

v3: Fix putreg(). Edit the changelog.

v4: Update the task write helper functions and do_arch_prctl_64(). Fix the comment in putreg().

v5: Fix preempt_disable() calls in do_arch_prctl_64()

Ingo, Thomas: can we get this in x86/urgent, please?

Quoted 7 lines
arch/x86/kernel/ptrace.c +0 -0
index ffae9b9740fd..4b8ee05dd6ad 100644
@@ -397,11 +397,12 @@ static int putreg(struct task_struct *child,
                if (value >= TASK_SIZE_MAX)
                        return -EIO;

arch/x86/kernel/ptrace.c static int putreg(struct task_struct *child, · line 405

Quoted 10 lines
arch/x86/kernel/ptrace.c +4 -3
                /*
-                * When changing the FS base, use the same
-                * mechanism as for do_arch_prctl_64().
+                * When changing the FS base, use do_arch_prctl_64()
+                * to set the index to zero and to set the base
+                * as requested.
                 */
                if (child->thread.fsbase != value)
-                       return x86_fsbase_write_task(child, value);
+                       return do_arch_prctl_64(child, ARCH_SET_FS, value);

FWIW, this logic is and was nonsensical, but it matches historical behavior, so I guess it's okay. I suspect that gdb only works by luck, since fs_base has a *higher* index than fs (and same for gs), which means that SETREGS with a nonzero fs or gs likely only works because the target almost always already has fs_base or gs_base == 0, so we bypass this entire mess.

Sigh. When you resubmit the full FSGSBASE series, I'll review the new code extra carefully.

#2 lore raw
Quoted 17 lines · Andy Lutomirski
Quoted 16 lines · Chang S. Bae

The helper functions that purport to write the base should just write it only. It shouldn't have magic optimizations to change the index.

Make the index explicitly changed from the caller, instead of including the code in the helpers.

Subsequently, the task write helpers do not handle for the current task anymore. The range check for a base value is also factored out, to minimize code redundancy from the caller.

v2: Fix further on the task write functions. Revert the changes on the task read helpers.

v3: Fix putreg(). Edit the changelog.

Quoted 8 lines
Quoted 4 lines

v4: Update the task write helper functions and do_arch_prctl_64(). Fix the comment in putreg().

v5: Fix preempt_disable() calls in do_arch_prctl_64()

Ingo, Thomas: can we get this in x86/urgent, please?

Sadly this commit introduced a boot failure on both an Intel and an AMD 64-bit testbox.

Symptoms range from silent bootup hang in early userspace to segfaults like this:

[   21.885741] random: systemd: uninitialized urandom read (16 bytes read)
[   21.964778] systemd[1]: segfault at 28 ip 00005584d8d8247d sp 00007ffc7a05aed0 error 4 in systemd[5584d8d0d000+137000]
[   21.977664] Code: c3 4c 89 ff e8 94 78 fa ff eb bb 48 89 c3 eb f1 00 00 00 00 00 00 00 00 00 00 00 00 00 41 55 41 54 55 53 48 89 fd 48 83 ec 28 <64> 48 8b 04 25 28 00 00 00 48 89 44 24 18 31 c0 48 85 ff 74 6e 48
[   22.000004] systemd[1]: segfault at 28 ip 00005584d8db0a3d sp 00007ffc7a05a7e0 error 4 in systemd[5584d8d0d000+137000]
[   22.012869] Code: 49 89 e9 ba 67 01 00 00 bf 04 00 00 00 31 c0 e8 c9 1c 03 00 59 31 c0 5e e9 ff fa ff ff 41 54 55 53 89 fb 48 81 ec 40 01 00 00 <64> 48 8b 04 25 28 00 00 00 48 89 84 24 38 01 00 00 31 c0 e8 fb 92

I've zapped the commit from x86/urgent because it's clearly not ready yet.

I used a fairly regular distro .config and a fairly regular distro - nothing fancy.

Thanks,

Ingo

#3 lore raw
Quoted 42 lines · Ingo Molnar
Quoted 17 lines · Andy Lutomirski
Quoted 16 lines · Chang S. Bae

The helper functions that purport to write the base should just write it only. It shouldn't have magic optimizations to change the index.

Make the index explicitly changed from the caller, instead of including the code in the helpers.

Subsequently, the task write helpers do not handle for the current task anymore. The range check for a base value is also factored out, to minimize code redundancy from the caller.

v2: Fix further on the task write functions. Revert the changes on the task read helpers.

v3: Fix putreg(). Edit the changelog.

Quoted 8 lines
Quoted 4 lines

v4: Update the task write helper functions and do_arch_prctl_64(). Fix the comment in putreg().

v5: Fix preempt_disable() calls in do_arch_prctl_64()

Ingo, Thomas: can we get this in x86/urgent, please?

Sadly this commit introduced a boot failure on both an Intel and an AMD 64-bit testbox.

Symptoms range from silent bootup hang in early userspace to segfaults like this:

[   21.885741] random: systemd: uninitialized urandom read (16 bytes read)
[   21.964778] systemd[1]: segfault at 28 ip 00005584d8d8247d sp 00007ffc7a05aed0 error 4 in systemd[5584d8d0d000+137000]
[   21.977664] Code: c3 4c 89 ff e8 94 78 fa ff eb bb 48 89 c3 eb f1 00 00 00 00 00 00 00 00 00 00 00 00 00 41 55 41 54 55 53 48 89 fd 48 83 ec 28 <64> 48 8b 04 25 28 00 00 00 48 89 44 24 18 31 c0 48 85 ff 74 6e 48
[   22.000004] systemd[1]: segfault at 28 ip 00005584d8db0a3d sp 00007ffc7a05a7e0 error 4 in systemd[5584d8d0d000+137000]
[   22.012869] Code: 49 89 e9 ba 67 01 00 00 bf 04 00 00 00 31 c0 e8 c9 1c 03 00 59 31 c0 5e e9 ff fa ff ff 41 54 55 53 89 fb 48 81 ec 40 01 00 00 <64> 48 8b 04 25 28 00 00 00 48 89 84 24 38 01 00 00 31 c0 e8 fb 92
Quoted 6 lines

I've zapped the commit from x86/urgent because it's clearly not ready yet.

I used a fairly regular distro .config and a fairly regular distro - nothing fancy.

I can reproduce it. Off the top of my head, maybe 0day is using a different, weird glibc configuration? I think it runs some ancient version of Yocto.

And I think I've almost root-caused the problem, and I think it's a preexisting bug exposed by this patch. Lemme double-check and I'll send a fix.

#4 lore raw
Quoted 51 lines · Andy Lutomirski
Quoted 42 lines · Ingo Molnar
Quoted 17 lines · Andy Lutomirski
Quoted 16 lines · Chang S. Bae

The helper functions that purport to write the base should just write it only. It shouldn't have magic optimizations to change the index.

Make the index explicitly changed from the caller, instead of including the code in the helpers.

Subsequently, the task write helpers do not handle for the current task anymore. The range check for a base value is also factored out, to minimize code redundancy from the caller.

v2: Fix further on the task write functions. Revert the changes on the task read helpers.

v3: Fix putreg(). Edit the changelog.

Quoted 8 lines
Quoted 4 lines

v4: Update the task write helper functions and do_arch_prctl_64(). Fix the comment in putreg().

v5: Fix preempt_disable() calls in do_arch_prctl_64()

Ingo, Thomas: can we get this in x86/urgent, please?

Sadly this commit introduced a boot failure on both an Intel and an AMD 64-bit testbox.

Symptoms range from silent bootup hang in early userspace to segfaults like this:

[   21.885741] random: systemd: uninitialized urandom read (16 bytes read)
[   21.964778] systemd[1]: segfault at 28 ip 00005584d8d8247d sp 00007ffc7a05aed0 error 4 in systemd[5584d8d0d000+137000]
[   21.977664] Code: c3 4c 89 ff e8 94 78 fa ff eb bb 48 89 c3 eb f1 00 00 00 00 00 00 00 00 00 00 00 00 00 41 55 41 54 55 53 48 89 fd 48 83 ec 28 <64> 48 8b 04 25 28 00 00 00 48 89 44 24 18 31 c0 48 85 ff 74 6e 48
[   22.000004] systemd[1]: segfault at 28 ip 00005584d8db0a3d sp 00007ffc7a05a7e0 error 4 in systemd[5584d8d0d000+137000]
[   22.012869] Code: 49 89 e9 ba 67 01 00 00 bf 04 00 00 00 31 c0 e8 c9 1c 03 00 59 31 c0 5e e9 ff fa ff ff 41 54 55 53 89 fb 48 81 ec 40 01 00 00 <64> 48 8b 04 25 28 00 00 00 48 89 84 24 38 01 00 00 31 c0 e8 fb 92
Quoted 6 lines

I've zapped the commit from x86/urgent because it's clearly not ready yet.

I used a fairly regular distro .config and a fairly regular distro - nothing fancy.

Quoted 7 lines

I can reproduce it. Off the top of my head, maybe 0day is using a different, weird glibc configuration? I think it runs some ancient version of Yocto.

And I think I've almost root-caused the problem, and I think it's a preexisting bug exposed by this patch. Lemme double-check and I'll send a fix.

Nope, I'm wrong. Delta fix attached. Want to just fold this in?

commit a5f99bc80c9bdacf3a1902f8922ca9b939d52723

Author: Andy Lutomirski <[email protected]>
Date:   Thu Nov 22 16:53:57 2018 -0800

x86/fsgsbase/64: Fix do_arch_prctl_64() to work correctly wrt save_base_legacy()

arch/x86/kernel/process_64.c +13 -0
index 74035c2a85b3..fcf528df5b8d 100644
@@ -733,6 +733,13 @@ long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2)
 		if (task == current) {
 			loadseg(GS, 0);
 			x86_gsbase_write_cpu_inactive(arg2);
+
+			/*
+			 * On non-FSGSBASE systems, save_base_legacy() expects
+			 * that we also fill in thread.gsbase.
+			 */
+			task->thread.gsbase = arg2;
+
 		} else {
 			task->thread.gsindex = 0;
 			x86_gsbase_write_task(task, arg2);
@@ -756,6 +763,12 @@ long do_arch_prctl_64(struct task_struct *task, int option, unsigned long arg2)
 		if (task == current) {
 			loadseg(FS, 0);
 			x86_fsbase_write_cpu(arg2);
+
+			/*
+			 * On non-FSGSBASE systems, save_base_legacy() expects
+			 * that we also fill in thread.fsbase.
+			 */
+			task->thread.fsbase = arg2;
 		} else {
 			task->thread.fsindex = 0;
 			x86_fsbase_write_task(task, arg2);
#5 lore raw
In reply to Chang S. Bae
x86/fsgsbase/64: Fix the base write helper functions
Commit-ID:  8b791a31e730a652537635a53b2ac02db8e6da1d
Gitweb:     https://git.kernel.org/tip/8b791a31e730a652537635a53b2ac02db8e6da1d
Author:     Chang S. Bae <[email protected]>
AuthorDate: Fri, 16 Nov 2018 15:27:28 -0800
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 21 Nov 2018 22:23:51 +0100

x86/fsgsbase/64: Fix the base write helper functions

The helper functions that purport to write the base should just write it only. They shouldn't have magic optimizations to change the index.

Make the index explicitly changed in the caller, instead of including the code in the helpers.

Subsequently, the task write helpers do not handle for the current task anymore. The range check for a base value is also factored out, to minimize code redundancy from the caller.

Fixes b1378a561fd1 ("x86/fsgsbase/64: Introduce FS/GS base helper functions")
Cc "H . Peter Anvin" <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Ravi Shankar <[email protected]>
Cc H. Peter Anvin <[email protected]>
---
 arch/x86/include/asm/fsgsbase.h | 15 +++++--
 arch/x86/kernel/process_64.c    | 86 ++++++++++++++++++++---------------------
 arch/x86/kernel/ptrace.c        |  9 +++--
 3 files changed, 58 insertions(+), 52 deletions(-)
arch/x86/include/asm/fsgsbase.h +11 -4
index eb377b6e9eed..bca4c743de77 100644
@@ -16,8 +16,8 @@
  */
 extern unsigned long x86_fsbase_read_task(struct task_struct *task);
 extern unsigned long x86_gsbase_read_task(struct task_struct *task);
-extern int x86_fsbase_write_task(struct task_struct *task, unsigned long fsbase);
-extern int x86_gsbase_write_task(struct task_struct *task, unsigned long gsbase);
+extern void x86_fsbase_write_task(struct task_struct *task, unsigned long fsbase);
+extern void x86_gsbase_write_task(struct task_struct *task, unsigned long gsbase);
 
 /* Helper functions for reading/writing FS/GS base */
 
@@ -39,8 +39,15 @@ static inline unsigned long x86_gsbase_read_cpu_inactive(void)
 	return gsbase;
 }
 
-extern void x86_fsbase_write_cpu(unsigned long fsbase);
-extern void x86_gsbase_write_cpu_inactive(unsigned long gsbase);
+static inline void x86_fsbase_write_cpu(unsigned long fsbase)
+{
+	wrmsrl(MSR_FS_BASE, fsbase);
+}
+
+static inline void x86_gsbase_write_cpu_inactive(unsigned long gsbase)
+{
+	wrmsrl(MSR_KERNEL_GS_BASE, gsbase);
+}
 
 #endif /* CONFIG_X86_64 */
 
arch/x86/kernel/process_64.c +42 -44

115 lines not on this page · raw message

arch/x86/kernel/ptrace.c +5 -4
index ffae9b9740fd..4b8ee05dd6ad 100644
@@ -397,11 +397,12 @@ static int putreg(struct task_struct *child,
 		if (value >= TASK_SIZE_MAX)
 			return -EIO;
 		/*
-		 * When changing the FS base, use the same
-		 * mechanism as for do_arch_prctl_64().
+		 * When changing the FS base, use do_arch_prctl_64()
+		 * to set the index to zero and to set the base
+		 * as requested.
 		 */
 		if (child->thread.fsbase != value)
-			return x86_fsbase_write_task(child, value);
+			return do_arch_prctl_64(child, ARCH_SET_FS, value);
 		return 0;
 	case offsetof(struct user_regs_struct,gs_base):
 		/*
@@ -410,7 +411,7 @@ static int putreg(struct task_struct *child,
 		if (value >= TASK_SIZE_MAX)
 			return -EIO;
 		if (child->thread.gsbase != value)
-			return x86_gsbase_write_task(child, value);
+			return do_arch_prctl_64(child, ARCH_SET_GS, value);
 		return 0;
 #endif
 	}