p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arm64: Treat handle_arch_irq as a function pointer 

handle_arch_irq isn't actually text, it's just a function pointer.
It doesn't need to be stored in the text section and doing so
causes problesm if we ever want to make the kernel text read only.
Declare handle_arch_irq as a proper function pointer stored in
the data section.

Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Laura Abbott 2014-11-21 21:50:38 +00:00 committed by Will Deacon
parent 3eebdbe5fc
commit fcff588633
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/include/asm/irq.h
View File

@ -3,7 +3,6 @@
#include <asm-generic/irq.h> #include <asm-generic/irq.h>
extern void (*handle_arch_irq)(struct pt_regs *);
extern void migrate_irqs(void); extern void migrate_irqs(void);
extern void set_handle_irq(void (*handle_irq)(struct pt_regs *)); extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));

6
arch/arm64/kernel/entry.S
View File

@ -167,7 +167,8 @@ tsk .req x28 // current thread_info
* Interrupt handling. * Interrupt handling.
*/ */
.macro irq_handler .macro irq_handler
ldr x1, handle_arch_irq adrp x1, handle_arch_irq
ldr x1, [x1, #:lo12:handle_arch_irq]
mov x0, sp mov x0, sp
blr x1 blr x1
.endm .endm
@ -699,6 +700,3 @@ ENTRY(sys_rt_sigreturn_wrapper)
mov x0, sp mov x0, sp
b sys_rt_sigreturn b sys_rt_sigreturn
ENDPROC(sys_rt_sigreturn_wrapper) ENDPROC(sys_rt_sigreturn_wrapper)
ENTRY(handle_arch_irq)
.quad 0

2
arch/arm64/kernel/irq.c
View File

@ -40,6 +40,8 @@ int arch_show_interrupts(struct seq_file *p, int prec)
return 0; return 0;
} }
void (*handle_arch_irq)(struct pt_regs *) = NULL;
void __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
{ {
if (handle_arch_irq) if (handle_arch_irq)