summaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2015-01-22 11:27:59 -0800
committerWilly Tarreau <w@1wt.eu>2015-05-24 10:10:34 +0200
commit1f50d3c7d68ecc12cd6cf2706065d25a6cf4b928 (patch)
treecf8857c37a2ddbb4bbea53037b8924e2bcb3e0d4 /arch/microblaze
parent598b6280c55ff1a105cf8cd0f6b95aee86ce9016 (diff)
x86, tls: Interpret an all-zero struct user_desc as "no segment"
commit 3669ef9fa7d35f573ec9c0e0341b29251c2734a7 upstream. 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: torvalds@linux-foundation.org Link: http://lkml.kernel.org/r/0cb251abe1ff0958b8e468a9a9a905b80ae3a746.1421954363.git.luto@amacapital.net Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> (cherry picked from commit 3175b4cb1aa4b1430fada4679be4598f6eb8872b) Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'arch/microblaze')
0 files changed, 0 insertions, 0 deletions