all arches, signal: move restart_block to struct task_struct
authorAndy Lutomirski <luto@amacapital.net>
Thu, 12 Feb 2015 23:01:14 +0000 (15:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Feb 2015 02:54:12 +0000 (18:54 -0800)
commitf56141e3e2d9aabf7e6b89680ab572c2cdbb2a24
tree481e3d99bc1121ce75d505d340153b9d158e60c5
parentedc924e023ae2022fc29f1246e115c610c9abf38
all arches, signal: move restart_block to struct task_struct

If an attacker can cause a controlled kernel stack overflow, overwriting
the restart block is a very juicy exploit target.  This is because the
restart_block is held in the same memory allocation as the kernel stack.

Moving the restart block to struct task_struct prevents this exploit by
making the restart_block harder to locate.

Note that there are other fields in thread_info that are also easy
targets, at least on some architectures.

It's also a decent simplification, since the restart code is more or less
identical on all architectures.

[james.hogan@imgtec.com: metag: align thread_info::supervisor_stack]
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: David Miller <davem@davemloft.net>
Acked-by: Richard Weinberger <richard@nod.at>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Steven Miao <realmz6@gmail.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Tested-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Chen Liqin <liqin.linux@gmail.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Chris Metcalf <cmetcalf@ezchip.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
84 files changed:
arch/alpha/include/asm/thread_info.h
arch/alpha/kernel/signal.c
arch/arc/include/asm/thread_info.h
arch/arc/kernel/signal.c
arch/arm/include/asm/thread_info.h
arch/arm/kernel/signal.c
arch/arm64/include/asm/thread_info.h
arch/arm64/kernel/signal.c
arch/arm64/kernel/signal32.c
arch/avr32/include/asm/thread_info.h
arch/avr32/kernel/asm-offsets.c
arch/avr32/kernel/signal.c
arch/blackfin/include/asm/thread_info.h
arch/blackfin/kernel/signal.c
arch/c6x/include/asm/thread_info.h
arch/c6x/kernel/signal.c
arch/cris/arch-v10/kernel/signal.c
arch/cris/arch-v32/kernel/signal.c
arch/cris/include/asm/thread_info.h
arch/frv/include/asm/thread_info.h
arch/frv/kernel/asm-offsets.c
arch/frv/kernel/signal.c
arch/hexagon/include/asm/thread_info.h
arch/hexagon/kernel/signal.c
arch/ia64/include/asm/thread_info.h
arch/ia64/kernel/signal.c
arch/m32r/include/asm/thread_info.h
arch/m32r/kernel/signal.c
arch/m68k/include/asm/thread_info.h
arch/m68k/kernel/signal.c
arch/metag/include/asm/thread_info.h
arch/metag/kernel/signal.c
arch/microblaze/include/asm/thread_info.h
arch/microblaze/kernel/signal.c
arch/mips/include/asm/thread_info.h
arch/mips/kernel/asm-offsets.c
arch/mips/kernel/signal.c
arch/mips/kernel/signal32.c
arch/mn10300/include/asm/thread_info.h
arch/mn10300/kernel/asm-offsets.c
arch/mn10300/kernel/signal.c
arch/openrisc/include/asm/thread_info.h
arch/openrisc/kernel/signal.c
arch/parisc/include/asm/thread_info.h
arch/parisc/kernel/signal.c
arch/powerpc/include/asm/thread_info.h
arch/powerpc/kernel/signal_32.c
arch/powerpc/kernel/signal_64.c
arch/s390/include/asm/thread_info.h
arch/s390/kernel/compat_signal.c
arch/s390/kernel/signal.c
arch/score/include/asm/thread_info.h
arch/score/kernel/asm-offsets.c
arch/score/kernel/signal.c
arch/sh/include/asm/thread_info.h
arch/sh/kernel/asm-offsets.c
arch/sh/kernel/signal_32.c
arch/sh/kernel/signal_64.c
arch/sparc/include/asm/thread_info_32.h
arch/sparc/include/asm/thread_info_64.h
arch/sparc/kernel/signal32.c
arch/sparc/kernel/signal_32.c
arch/sparc/kernel/signal_64.c
arch/sparc/kernel/traps_64.c
arch/tile/include/asm/thread_info.h
arch/tile/kernel/signal.c
arch/um/include/asm/thread_info.h
arch/unicore32/include/asm/thread_info.h
arch/unicore32/kernel/signal.c
arch/x86/ia32/ia32_signal.c
arch/x86/include/asm/thread_info.h
arch/x86/kernel/signal.c
arch/x86/um/signal.c
arch/xtensa/include/asm/thread_info.h
arch/xtensa/kernel/signal.c
fs/select.c
include/linux/init_task.h
include/linux/sched.h
kernel/compat.c
kernel/futex.c
kernel/signal.c
kernel/time/alarmtimer.c
kernel/time/hrtimer.c
kernel/time/posix-cpu-timers.c