2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/errno.h>
|
|
|
|
#include <linux/sched.h>
|
|
|
|
#include <linux/user.h>
|
2008-01-30 20:31:52 +08:00
|
|
|
#include <linux/regset.h>
|
2013-01-22 04:25:54 +08:00
|
|
|
#include <linux/syscalls.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2016-12-25 03:46:01 +08:00
|
|
|
#include <linux/uaccess.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/desc.h>
|
|
|
|
#include <asm/ldt.h>
|
|
|
|
#include <asm/processor.h>
|
|
|
|
#include <asm/proto.h>
|
|
|
|
|
2008-01-30 20:31:52 +08:00
|
|
|
#include "tls.h"
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* sys_alloc_thread_area: get a yet unused TLS descriptor index.
|
|
|
|
*/
|
|
|
|
static int get_free_idx(void)
|
|
|
|
{
|
|
|
|
struct thread_struct *t = ¤t->thread;
|
|
|
|
int idx;
|
|
|
|
|
|
|
|
for (idx = 0; idx < GDT_ENTRY_TLS_ENTRIES; idx++)
|
2008-01-30 20:30:46 +08:00
|
|
|
if (desc_empty(&t->tls_array[idx]))
|
2005-04-17 06:20:36 +08:00
|
|
|
return idx + GDT_ENTRY_TLS_MIN;
|
|
|
|
return -ESRCH;
|
|
|
|
}
|
|
|
|
|
2014-12-05 08:48:16 +08:00
|
|
|
static bool tls_desc_okay(const struct user_desc *info)
|
|
|
|
{
|
x86, tls: Interpret an all-zero struct user_desc as "no segment"
The Witcher 2 did something like this to allocate a TLS segment index:
struct user_desc u_info;
bzero(&u_info, sizeof(u_info));
u_info.entry_number = (uint32_t)-1;
syscall(SYS_set_thread_area, &u_info);
Strictly speaking, this code was never correct. It should have set
read_exec_only and seg_not_present to 1 to indicate that it wanted
to find a free slot without putting anything there, or it should
have put something sensible in the TLS slot if it wanted to allocate
a TLS entry for real. The actual effect of this code was to
allocate a bogus segment that could be used to exploit espfix.
The set_thread_area hardening patches changed the behavior, causing
set_thread_area to return -EINVAL and crashing the game.
This changes set_thread_area to interpret this as a request to find
a free slot and to leave it empty, which isn't *quite* what the game
expects but should be close enough to keep it working. In
particular, using the code above to allocate two segments will
allocate the same segment both times.
According to FrostbittenKing on Github, this fixes The Witcher 2.
If this somehow still causes problems, we could instead allocate
a limit==0 32-bit data segment, but that seems rather ugly to me.
Fixes: 41bdc78544b8 x86/tls: Validate TLS entries to protect espfix
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Cc: stable@vger.kernel.org
Cc: torvalds@linux-foundation.org
Link: http://lkml.kernel.org/r/0cb251abe1ff0958b8e468a9a9a905b80ae3a746.1421954363.git.luto@amacapital.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2015-01-23 03:27:59 +08:00
|
|
|
/*
|
|
|
|
* For historical reasons (i.e. no one ever documented how any
|
|
|
|
* of the segmentation APIs work), user programs can and do
|
|
|
|
* assume that a struct user_desc that's all zeros except for
|
|
|
|
* entry_number means "no segment at all". This never actually
|
|
|
|
* worked. In fact, up to Linux 3.19, a struct user_desc like
|
|
|
|
* this would create a 16-bit read-write segment with base and
|
|
|
|
* limit both equal to zero.
|
|
|
|
*
|
|
|
|
* That was close enough to "no segment at all" until we
|
|
|
|
* hardened this function to disallow 16-bit TLS segments. Fix
|
|
|
|
* it up by interpreting these zeroed segments the way that they
|
|
|
|
* were almost certainly intended to be interpreted.
|
|
|
|
*
|
|
|
|
* The correct way to ask for "no segment at all" is to specify
|
|
|
|
* a user_desc that satisfies LDT_empty. To keep everything
|
|
|
|
* working, we accept both.
|
|
|
|
*
|
|
|
|
* Note that there's a similar kludge in modify_ldt -- look at
|
|
|
|
* the distinction between modes 1 and 0x11.
|
|
|
|
*/
|
|
|
|
if (LDT_empty(info) || LDT_zero(info))
|
2014-12-05 08:48:16 +08:00
|
|
|
return true;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* espfix is required for 16-bit data segments, but espfix
|
|
|
|
* only works for LDT segments.
|
|
|
|
*/
|
|
|
|
if (!info->seg_32bit)
|
|
|
|
return false;
|
|
|
|
|
2014-12-05 08:48:17 +08:00
|
|
|
/* Only allow data segments in the TLS array. */
|
|
|
|
if (info->contents > 1)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Non-present segments with DPL 3 present an interesting attack
|
|
|
|
* surface. The kernel should handle such segments correctly,
|
|
|
|
* but TLS is very difficult to protect in a sandbox, so prevent
|
|
|
|
* such segments from being created.
|
|
|
|
*
|
|
|
|
* If userspace needs to remove a TLS entry, it can still delete
|
|
|
|
* it outright.
|
|
|
|
*/
|
|
|
|
if (info->seg_not_present)
|
|
|
|
return false;
|
|
|
|
|
2014-12-05 08:48:16 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2008-01-30 20:31:51 +08:00
|
|
|
static void set_tls_desc(struct task_struct *p, int idx,
|
2008-01-30 20:31:52 +08:00
|
|
|
const struct user_desc *info, int n)
|
2008-01-30 20:31:51 +08:00
|
|
|
{
|
|
|
|
struct thread_struct *t = &p->thread;
|
|
|
|
struct desc_struct *desc = &t->tls_array[idx - GDT_ENTRY_TLS_MIN];
|
|
|
|
int cpu;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We must not get preempted while modifying the TLS.
|
|
|
|
*/
|
|
|
|
cpu = get_cpu();
|
|
|
|
|
2008-01-30 20:31:52 +08:00
|
|
|
while (n-- > 0) {
|
2017-03-19 13:17:24 +08:00
|
|
|
if (LDT_empty(info) || LDT_zero(info)) {
|
2017-08-28 14:47:40 +08:00
|
|
|
memset(desc, 0, sizeof(*desc));
|
2017-03-19 13:17:24 +08:00
|
|
|
} else {
|
2008-01-30 20:31:52 +08:00
|
|
|
fill_ldt(desc, info);
|
2017-03-19 13:17:24 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Always set the accessed bit so that the CPU
|
|
|
|
* doesn't try to write to the (read-only) GDT.
|
|
|
|
*/
|
|
|
|
desc->type |= 1;
|
|
|
|
}
|
2008-01-30 20:31:52 +08:00
|
|
|
++info;
|
|
|
|
++desc;
|
|
|
|
}
|
2008-01-30 20:31:51 +08:00
|
|
|
|
|
|
|
if (t == ¤t->thread)
|
|
|
|
load_TLS(t, cpu);
|
|
|
|
|
|
|
|
put_cpu();
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* Set a given TLS descriptor:
|
|
|
|
*/
|
2008-01-30 20:30:46 +08:00
|
|
|
int do_set_thread_area(struct task_struct *p, int idx,
|
|
|
|
struct user_desc __user *u_info,
|
|
|
|
int can_allocate)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct user_desc info;
|
x86/tls: Synchronize segment registers in set_thread_area()
The current behavior of set_thread_area() when it modifies a segment that is
currently loaded is a bit confused.
If CS [1] or SS is modified, the change will take effect on return
to userspace because CS and SS are fundamentally always reloaded on
return to userspace.
Similarly, on 32-bit kernels, if DS, ES, FS, or (depending on
configuration) GS refers to a modified segment, the change will take
effect immediately on return to user mode because the entry code
reloads these registers.
If set_thread_area() modifies DS, ES [2], FS, or GS on 64-bit kernels or
GS on 32-bit lazy-GS [3] kernels, however, the segment registers
will be left alone until something (most likely a context switch)
causes them to be reloaded. This means that behavior visible to
user space is inconsistent.
If set_thread_area() is implicitly called via CLONE_SETTLS, then all
segment registers will be reloaded before the thread starts because
CLONE_SETTLS happens before the initial context switch into the
newly created thread.
Empirically, glibc requires the immediate reload on CLONE_SETTLS --
32-bit glibc on my system does *not* manually reload GS when
creating a new thread.
Before enabling FSGSBASE, we need to figure out what the behavior
will be, as FSGSBASE requires that we reconsider our behavior when,
e.g., GS and GSBASE are out of sync in user mode. Given that we
must preserve the existing behavior of CLONE_SETTLS, it makes sense
to me that we simply extend similar behavior to all invocations
of set_thread_area().
This patch explicitly updates any segment register referring to a
segment that is targetted by set_thread_area(). If set_thread_area()
deletes the segment, then the segment register will be nulled out.
[1] This can't actually happen since 0e58af4e1d21 ("x86/tls:
Disallow unusual TLS segments") but, if it did, this is how it
would behave.
[2] I strongly doubt that any existing non-malicious program loads a
TLS segment into DS or ES on a 64-bit kernel because the context
switch code was badly broken until recently, but that's not an
excuse to leave the current code alone.
[3] One way or another, that config option should to go away. Yuck!
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/27d119b0d396e9b82009e40dff8333a249038225.1461698311.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-27 03:23:30 +08:00
|
|
|
unsigned short __maybe_unused sel, modified_sel;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (copy_from_user(&info, u_info, sizeof(info)))
|
|
|
|
return -EFAULT;
|
|
|
|
|
2014-12-05 08:48:16 +08:00
|
|
|
if (!tls_desc_okay(&info))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-01-30 20:30:46 +08:00
|
|
|
if (idx == -1)
|
|
|
|
idx = info.entry_number;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* index -1 means the kernel should try to find and
|
|
|
|
* allocate an empty descriptor:
|
|
|
|
*/
|
2008-01-30 20:30:46 +08:00
|
|
|
if (idx == -1 && can_allocate) {
|
2005-04-17 06:20:36 +08:00
|
|
|
idx = get_free_idx();
|
|
|
|
if (idx < 0)
|
|
|
|
return idx;
|
|
|
|
if (put_user(idx, &u_info->entry_number))
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-01-30 20:31:52 +08:00
|
|
|
set_tls_desc(p, idx, &info, 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
x86/tls: Synchronize segment registers in set_thread_area()
The current behavior of set_thread_area() when it modifies a segment that is
currently loaded is a bit confused.
If CS [1] or SS is modified, the change will take effect on return
to userspace because CS and SS are fundamentally always reloaded on
return to userspace.
Similarly, on 32-bit kernels, if DS, ES, FS, or (depending on
configuration) GS refers to a modified segment, the change will take
effect immediately on return to user mode because the entry code
reloads these registers.
If set_thread_area() modifies DS, ES [2], FS, or GS on 64-bit kernels or
GS on 32-bit lazy-GS [3] kernels, however, the segment registers
will be left alone until something (most likely a context switch)
causes them to be reloaded. This means that behavior visible to
user space is inconsistent.
If set_thread_area() is implicitly called via CLONE_SETTLS, then all
segment registers will be reloaded before the thread starts because
CLONE_SETTLS happens before the initial context switch into the
newly created thread.
Empirically, glibc requires the immediate reload on CLONE_SETTLS --
32-bit glibc on my system does *not* manually reload GS when
creating a new thread.
Before enabling FSGSBASE, we need to figure out what the behavior
will be, as FSGSBASE requires that we reconsider our behavior when,
e.g., GS and GSBASE are out of sync in user mode. Given that we
must preserve the existing behavior of CLONE_SETTLS, it makes sense
to me that we simply extend similar behavior to all invocations
of set_thread_area().
This patch explicitly updates any segment register referring to a
segment that is targetted by set_thread_area(). If set_thread_area()
deletes the segment, then the segment register will be nulled out.
[1] This can't actually happen since 0e58af4e1d21 ("x86/tls:
Disallow unusual TLS segments") but, if it did, this is how it
would behave.
[2] I strongly doubt that any existing non-malicious program loads a
TLS segment into DS or ES on a 64-bit kernel because the context
switch code was badly broken until recently, but that's not an
excuse to leave the current code alone.
[3] One way or another, that config option should to go away. Yuck!
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/27d119b0d396e9b82009e40dff8333a249038225.1461698311.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2016-04-27 03:23:30 +08:00
|
|
|
/*
|
|
|
|
* If DS, ES, FS, or GS points to the modified segment, forcibly
|
|
|
|
* refresh it. Only needed on x86_64 because x86_32 reloads them
|
|
|
|
* on return to user mode.
|
|
|
|
*/
|
|
|
|
modified_sel = (idx << 3) | 3;
|
|
|
|
|
|
|
|
if (p == current) {
|
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
savesegment(ds, sel);
|
|
|
|
if (sel == modified_sel)
|
|
|
|
loadsegment(ds, sel);
|
|
|
|
|
|
|
|
savesegment(es, sel);
|
|
|
|
if (sel == modified_sel)
|
|
|
|
loadsegment(es, sel);
|
|
|
|
|
|
|
|
savesegment(fs, sel);
|
|
|
|
if (sel == modified_sel)
|
|
|
|
loadsegment(fs, sel);
|
|
|
|
|
|
|
|
savesegment(gs, sel);
|
|
|
|
if (sel == modified_sel)
|
|
|
|
load_gs_index(sel);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_X86_32_LAZY_GS
|
|
|
|
savesegment(gs, sel);
|
|
|
|
if (sel == modified_sel)
|
|
|
|
loadsegment(gs, sel);
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
if (p->thread.fsindex == modified_sel)
|
|
|
|
p->thread.fsbase = info.base_addr;
|
|
|
|
|
|
|
|
if (p->thread.gsindex == modified_sel)
|
|
|
|
p->thread.gsbase = info.base_addr;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-22 04:25:54 +08:00
|
|
|
SYSCALL_DEFINE1(set_thread_area, struct user_desc __user *, u_info)
|
2008-01-30 20:30:45 +08:00
|
|
|
{
|
2013-01-22 04:25:54 +08:00
|
|
|
return do_set_thread_area(current, -1, u_info, 1);
|
2008-01-30 20:30:45 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get the current Thread-Local Storage area:
|
|
|
|
*/
|
|
|
|
|
2008-01-30 20:31:51 +08:00
|
|
|
static void fill_user_desc(struct user_desc *info, int idx,
|
|
|
|
const struct desc_struct *desc)
|
|
|
|
|
|
|
|
{
|
|
|
|
memset(info, 0, sizeof(*info));
|
|
|
|
info->entry_number = idx;
|
|
|
|
info->base_addr = get_desc_base(desc);
|
|
|
|
info->limit = get_desc_limit(desc);
|
|
|
|
info->seg_32bit = desc->d;
|
|
|
|
info->contents = desc->type >> 2;
|
|
|
|
info->read_exec_only = !(desc->type & 2);
|
|
|
|
info->limit_in_pages = desc->g;
|
|
|
|
info->seg_not_present = !desc->p;
|
|
|
|
info->useable = desc->avl;
|
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
info->lm = desc->l;
|
|
|
|
#endif
|
|
|
|
}
|
2008-01-30 20:30:46 +08:00
|
|
|
|
|
|
|
int do_get_thread_area(struct task_struct *p, int idx,
|
|
|
|
struct user_desc __user *u_info)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct user_desc info;
|
|
|
|
|
2008-01-30 20:30:46 +08:00
|
|
|
if (idx == -1 && get_user(idx, &u_info->entry_number))
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EFAULT;
|
2008-01-30 20:31:51 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-01-30 20:31:51 +08:00
|
|
|
fill_user_desc(&info, idx,
|
|
|
|
&p->thread.tls_array[idx - GDT_ENTRY_TLS_MIN]);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (copy_to_user(u_info, &info, sizeof(info)))
|
|
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-22 04:25:54 +08:00
|
|
|
SYSCALL_DEFINE1(get_thread_area, struct user_desc __user *, u_info)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2013-01-22 04:25:54 +08:00
|
|
|
return do_get_thread_area(current, -1, u_info);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2008-01-30 20:31:52 +08:00
|
|
|
|
|
|
|
int regset_tls_active(struct task_struct *target,
|
|
|
|
const struct user_regset *regset)
|
|
|
|
{
|
|
|
|
struct thread_struct *t = &target->thread;
|
|
|
|
int n = GDT_ENTRY_TLS_ENTRIES;
|
|
|
|
while (n > 0 && desc_empty(&t->tls_array[n - 1]))
|
|
|
|
--n;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
int regset_tls_get(struct task_struct *target, const struct user_regset *regset,
|
|
|
|
unsigned int pos, unsigned int count,
|
|
|
|
void *kbuf, void __user *ubuf)
|
|
|
|
{
|
|
|
|
const struct desc_struct *tls;
|
|
|
|
|
2012-03-24 15:52:50 +08:00
|
|
|
if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
|
2008-01-30 20:31:52 +08:00
|
|
|
(pos % sizeof(struct user_desc)) != 0 ||
|
|
|
|
(count % sizeof(struct user_desc)) != 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
pos /= sizeof(struct user_desc);
|
|
|
|
count /= sizeof(struct user_desc);
|
|
|
|
|
|
|
|
tls = &target->thread.tls_array[pos];
|
|
|
|
|
|
|
|
if (kbuf) {
|
|
|
|
struct user_desc *info = kbuf;
|
|
|
|
while (count-- > 0)
|
|
|
|
fill_user_desc(info++, GDT_ENTRY_TLS_MIN + pos++,
|
|
|
|
tls++);
|
|
|
|
} else {
|
|
|
|
struct user_desc __user *u_info = ubuf;
|
|
|
|
while (count-- > 0) {
|
|
|
|
struct user_desc info;
|
|
|
|
fill_user_desc(&info, GDT_ENTRY_TLS_MIN + pos++, tls++);
|
|
|
|
if (__copy_to_user(u_info++, &info, sizeof(info)))
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
|
|
|
|
unsigned int pos, unsigned int count,
|
|
|
|
const void *kbuf, const void __user *ubuf)
|
|
|
|
{
|
|
|
|
struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES];
|
|
|
|
const struct user_desc *info;
|
2014-12-05 08:48:16 +08:00
|
|
|
int i;
|
2008-01-30 20:31:52 +08:00
|
|
|
|
2012-03-24 15:52:50 +08:00
|
|
|
if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
|
2008-01-30 20:31:52 +08:00
|
|
|
(pos % sizeof(struct user_desc)) != 0 ||
|
|
|
|
(count % sizeof(struct user_desc)) != 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (kbuf)
|
|
|
|
info = kbuf;
|
|
|
|
else if (__copy_from_user(infobuf, ubuf, count))
|
|
|
|
return -EFAULT;
|
|
|
|
else
|
|
|
|
info = infobuf;
|
|
|
|
|
2014-12-05 08:48:16 +08:00
|
|
|
for (i = 0; i < count / sizeof(struct user_desc); i++)
|
|
|
|
if (!tls_desc_okay(info + i))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-01-30 20:31:52 +08:00
|
|
|
set_tls_desc(target,
|
|
|
|
GDT_ENTRY_TLS_MIN + (pos / sizeof(struct user_desc)),
|
|
|
|
info, count / sizeof(struct user_desc));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|