mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
![Andy Lutomirski](/assets/img/avatar_default.png)
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>
109 lines
3.4 KiB
C
109 lines
3.4 KiB
C
/*
|
|
* Generate definitions needed by assembly language modules.
|
|
* This code generates raw asm output which is post-processed
|
|
* to extract and format the required data.
|
|
*/
|
|
|
|
#include <linux/sched.h>
|
|
#include <linux/signal.h>
|
|
#include <linux/personality.h>
|
|
#include <linux/kbuild.h>
|
|
#include <asm/ucontext.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/thread_info.h>
|
|
#include <asm/ptrace.h>
|
|
#include "sigframe.h"
|
|
#include "mn10300-serial.h"
|
|
|
|
void foo(void)
|
|
{
|
|
OFFSET(SIGCONTEXT_d0, sigcontext, d0);
|
|
OFFSET(SIGCONTEXT_d1, sigcontext, d1);
|
|
BLANK();
|
|
|
|
OFFSET(TI_task, thread_info, task);
|
|
OFFSET(TI_exec_domain, thread_info, exec_domain);
|
|
OFFSET(TI_frame, thread_info, frame);
|
|
OFFSET(TI_flags, thread_info, flags);
|
|
OFFSET(TI_cpu, thread_info, cpu);
|
|
OFFSET(TI_preempt_count, thread_info, preempt_count);
|
|
OFFSET(TI_addr_limit, thread_info, addr_limit);
|
|
BLANK();
|
|
|
|
OFFSET(REG_D0, pt_regs, d0);
|
|
OFFSET(REG_D1, pt_regs, d1);
|
|
OFFSET(REG_D2, pt_regs, d2);
|
|
OFFSET(REG_D3, pt_regs, d3);
|
|
OFFSET(REG_A0, pt_regs, a0);
|
|
OFFSET(REG_A1, pt_regs, a1);
|
|
OFFSET(REG_A2, pt_regs, a2);
|
|
OFFSET(REG_A3, pt_regs, a3);
|
|
OFFSET(REG_E0, pt_regs, e0);
|
|
OFFSET(REG_E1, pt_regs, e1);
|
|
OFFSET(REG_E2, pt_regs, e2);
|
|
OFFSET(REG_E3, pt_regs, e3);
|
|
OFFSET(REG_E4, pt_regs, e4);
|
|
OFFSET(REG_E5, pt_regs, e5);
|
|
OFFSET(REG_E6, pt_regs, e6);
|
|
OFFSET(REG_E7, pt_regs, e7);
|
|
OFFSET(REG_SP, pt_regs, sp);
|
|
OFFSET(REG_EPSW, pt_regs, epsw);
|
|
OFFSET(REG_PC, pt_regs, pc);
|
|
OFFSET(REG_LAR, pt_regs, lar);
|
|
OFFSET(REG_LIR, pt_regs, lir);
|
|
OFFSET(REG_MDR, pt_regs, mdr);
|
|
OFFSET(REG_MCVF, pt_regs, mcvf);
|
|
OFFSET(REG_MCRL, pt_regs, mcrl);
|
|
OFFSET(REG_MCRH, pt_regs, mcrh);
|
|
OFFSET(REG_MDRQ, pt_regs, mdrq);
|
|
OFFSET(REG_ORIG_D0, pt_regs, orig_d0);
|
|
OFFSET(REG_NEXT, pt_regs, next);
|
|
DEFINE(REG__END, sizeof(struct pt_regs));
|
|
BLANK();
|
|
|
|
OFFSET(THREAD_UREGS, thread_struct, uregs);
|
|
OFFSET(THREAD_PC, thread_struct, pc);
|
|
OFFSET(THREAD_SP, thread_struct, sp);
|
|
OFFSET(THREAD_A3, thread_struct, a3);
|
|
OFFSET(THREAD_USP, thread_struct, usp);
|
|
#ifdef CONFIG_FPU
|
|
OFFSET(THREAD_FPU_FLAGS, thread_struct, fpu_flags);
|
|
OFFSET(THREAD_FPU_STATE, thread_struct, fpu_state);
|
|
DEFINE(__THREAD_USING_FPU, THREAD_USING_FPU);
|
|
DEFINE(__THREAD_HAS_FPU, THREAD_HAS_FPU);
|
|
#endif /* CONFIG_FPU */
|
|
BLANK();
|
|
|
|
OFFSET(TASK_THREAD, task_struct, thread);
|
|
BLANK();
|
|
|
|
DEFINE(CLONE_VM_asm, CLONE_VM);
|
|
DEFINE(CLONE_FS_asm, CLONE_FS);
|
|
DEFINE(CLONE_FILES_asm, CLONE_FILES);
|
|
DEFINE(CLONE_SIGHAND_asm, CLONE_SIGHAND);
|
|
DEFINE(CLONE_UNTRACED_asm, CLONE_UNTRACED);
|
|
DEFINE(SIGCHLD_asm, SIGCHLD);
|
|
BLANK();
|
|
|
|
OFFSET(EXEC_DOMAIN_handler, exec_domain, handler);
|
|
OFFSET(RT_SIGFRAME_sigcontext, rt_sigframe, uc.uc_mcontext);
|
|
|
|
DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
|
|
|
|
OFFSET(__rx_buffer, mn10300_serial_port, rx_buffer);
|
|
OFFSET(__rx_inp, mn10300_serial_port, rx_inp);
|
|
OFFSET(__rx_outp, mn10300_serial_port, rx_outp);
|
|
OFFSET(__uart_state, mn10300_serial_port, uart.state);
|
|
OFFSET(__tx_xchar, mn10300_serial_port, tx_xchar);
|
|
OFFSET(__tx_flags, mn10300_serial_port, tx_flags);
|
|
OFFSET(__intr_flags, mn10300_serial_port, intr_flags);
|
|
OFFSET(__rx_icr, mn10300_serial_port, rx_icr);
|
|
OFFSET(__tx_icr, mn10300_serial_port, tx_icr);
|
|
OFFSET(__tm_icr, mn10300_serial_port, _tmicr);
|
|
OFFSET(__iobase, mn10300_serial_port, _iobase);
|
|
|
|
DEFINE(__UART_XMIT_SIZE, UART_XMIT_SIZE);
|
|
OFFSET(__xmit_buffer, uart_state, xmit.buf);
|
|
OFFSET(__xmit_head, uart_state, xmit.head);
|
|
OFFSET(__xmit_tail, uart_state, xmit.tail);
|
|
}
|