diff options
| author | Helge Deller <deller@gmx.de> | 2016-04-08 18:32:52 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2016-04-08 22:14:14 +0200 |
| commit | 2ef4dfd9d9f288943e249b78365a69e3ea3ec072 (patch) | |
| tree | b2add375348d201853d93329c144159cf45b96ae /arch/parisc/lib | |
| parent | ef72f3110d8b19f4c098a0bff7ed7d11945e70c6 (diff) | |
| download | op-kernel-dev-2ef4dfd9d9f288943e249b78365a69e3ea3ec072.zip op-kernel-dev-2ef4dfd9d9f288943e249b78365a69e3ea3ec072.tar.gz | |
parisc: Unbreak handling exceptions from kernel modules
Handling exceptions from modules never worked on parisc.
It was just masked by the fact that exceptions from modules
don't happen during normal use.
When a module triggers an exception in get_user() we need to load the
main kernel dp value before accessing the exception_data structure, and
afterwards restore the original dp value of the module on exit.
Noticed-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org
Diffstat (limited to 'arch/parisc/lib')
| -rw-r--r-- | arch/parisc/lib/fixup.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S index 536ef66..1052b74 100644 --- a/arch/parisc/lib/fixup.S +++ b/arch/parisc/lib/fixup.S @@ -26,6 +26,7 @@ #ifdef CONFIG_SMP .macro get_fault_ip t1 t2 + loadgp addil LT%__per_cpu_offset,%r27 LDREG RT%__per_cpu_offset(%r1),\t1 /* t2 = smp_processor_id() */ @@ -40,14 +41,19 @@ LDREG RT%exception_data(%r1),\t1 /* t1 = this_cpu_ptr(&exception_data) */ add,l \t1,\t2,\t1 + /* %r27 = t1->fault_gp - restore gp */ + LDREG EXCDATA_GP(\t1), %r27 /* t1 = t1->fault_ip */ LDREG EXCDATA_IP(\t1), \t1 .endm #else .macro get_fault_ip t1 t2 + loadgp /* t1 = this_cpu_ptr(&exception_data) */ addil LT%exception_data,%r27 LDREG RT%exception_data(%r1),\t2 + /* %r27 = t2->fault_gp - restore gp */ + LDREG EXCDATA_GP(\t2), %r27 /* t1 = t2->fault_ip */ LDREG EXCDATA_IP(\t2), \t1 .endm |
