| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20150428195335.11229.4516.stgit@ubuntu-yegoshin> Date: Tue, 28 Apr 2015 12:53:35 -0700 From: Leonid Yegoshin <Leonid.Yegoshin@...tec.com> To: <linux-mips@...ux-mips.org>, <macro@...ux-mips.org>, <markos.chandras@...tec.com>, <ralf@...ux-mips.org>, <linux-kernel@...r.kernel.org> Subject: [PATCH] MIPS64: R6: R2 emulation bugfix Error recovery pointers for fixups was improperly set as ".word" which is unsuitable for MIPS64. Replaced by __stringify(PTR) Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@...tec.com> --- arch/mips/kernel/mips-r2-to-r6-emul.c | 104 +++++++++++++++++---------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/arch/mips/kernel/mips-r2-to-r6-emul.c b/arch/mips/kernel/mips-r2-to-r6-emul.c index f2977f00911b..c6f079f8f3dc 100644 --- a/arch/mips/kernel/mips-r2-to-r6-emul.c +++ b/arch/mips/kernel/mips-r2-to-r6-emul.c @@ -1250,10 +1250,10 @@ fpu_emul: " j 10b\n" " .previous\n" " .section __ex_table,\"a\"\n" - " .word 1b,8b\n" - " .word 2b,8b\n" - " .word 3b,8b\n" - " .word 4b,8b\n" + __stringify(PTR) " 1b,8b\n" + __stringify(PTR) " 2b,8b\n" + __stringify(PTR) " 3b,8b\n" + __stringify(PTR) " 4b,8b\n" " .previous\n" " .set pop\n" : "+&r"(rt), "=&r"(rs), @@ -1325,10 +1325,10 @@ fpu_emul: " j 10b\n" " .previous\n" " .section __ex_table,\"a\"\n" - " .word 1b,8b\n" - " .word 2b,8b\n" - " .word 3b,8b\n" - " .word 4b,8b\n" + __stringify(PTR) " 1b,8b\n" + __stringify(PTR) " 2b,8b\n" + __stringify(PTR) " 3b,8b\n" + __stringify(PTR) " 4b,8b\n" " .previous\n" " .set pop\n" : "+&r"(rt), "=&r"(rs), @@ -1396,10 +1396,10 @@ fpu_emul: " j 9b\n" " .previous\n" " .section __ex_table,\"a\"\n" - " .word 1b,8b\n" - " .word 2b,8b\n" - " .word 3b,8b\n" - " .word 4b,8b\n" + __stringify(PTR) " 1b,8b\n" + __stringify(PTR) " 2b,8b\n" + __stringify(PTR) " 3b,8b\n" + __stringify(PTR) " 4b,8b\n" " .previous\n" " .set pop\n" : "+&r"(rt), "=&r"(rs), @@ -1466,10 +1466,10 @@ fpu_emul: " j 9b\n" " .previous\n" " .section __ex_table,\"a\"\n" - " .word 1b,8b\n" - " .word 2b,8b\n" - " .word 3b,8b\n" - " .word 4b,8b\n" + __stringify(PTR) " 1b,8b\n" + __stringify(PTR) " 2b,8b\n" + __stringify(PTR) " 3b,8b\n" + __stringify(PTR) " 4b,8b\n" " .previous\n" " .set pop\n" : "+&r"(rt), "=&r"(rs), @@ -1581,14 +1581,14 @@ fpu_emul: " j 9b\n" " .previous\n" " .section __ex_table,\"a\"\n" - " .word 1b,8b\n" - " .word 2b,8b\n" - " .word 3b,8b\n" - " .word 4b,8b\n" - " .word 5b,8b\n" - " .word 6b,8b\n" - " .word 7b,8b\n" - " .word 0b,8b\n" + __stringify(PTR) " 1b,8b\n" + __stringify(PTR) " 2b,8b\n" + __stringify(PTR) " 3b,8b\n" + __stringify(PTR) " 4b,8b\n" + __stringify(PTR) " 5b,8b\n" + __stringify(PTR) " 6b,8b\n" + __stringify(PTR) " 7b,8b\n" + __stringify(PTR) " 0b,8b\n" " .previous\n" " .set pop\n" : "+&r"(rt), "=&r"(rs), @@ -1700,14 +1700,14 @@ fpu_emul: " j 9b\n" " .previous\n" " .section __ex_table,\"a\"\n" - " .word 1b,8b\n" - " .word 2b,8b\n" - " .word 3b,8b\n" - " .word 4b,8b\n" - " .word 5b,8b\n" - " .word 6b,8b\n" - " .word 7b,8b\n" - " .word 0b,8b\n" + __stringify(PTR) " 1b,8b\n" + __stringify(PTR) " 2b,8b\n" + __stringify(PTR) " 3b,8b\n" + __stringify(PTR) " 4b,8b\n" + __stringify(PTR) " 5b,8b\n" + __stringify(PTR) " 6b,8b\n" + __stringify(PTR) " 7b,8b\n" + __stringify(PTR) " 0b,8b\n" " .previous\n" " .set pop\n" : "+&r"(rt), "=&r"(rs), @@ -1819,14 +1819,14 @@ fpu_emul: " j 9b\n" " .previous\n" " .section __ex_table,\"a\"\n" - " .word 1b,8b\n" - " .word 2b,8b\n" - " .word 3b,8b\n" - " .word 4b,8b\n" - " .word 5b,8b\n" - " .word 6b,8b\n" - " .word 7b,8b\n" - " .word 0b,8b\n" + __stringify(PTR) " 1b,8b\n" + __stringify(PTR) " 2b,8b\n" + __stringify(PTR) " 3b,8b\n" + __stringify(PTR) " 4b,8b\n" + __stringify(PTR) " 5b,8b\n" + __stringify(PTR) " 6b,8b\n" + __stringify(PTR) " 7b,8b\n" + __stringify(PTR) " 0b,8b\n" " .previous\n" " .set pop\n" : "+&r"(rt), "=&r"(rs), @@ -1937,14 +1937,14 @@ fpu_emul: " j 9b\n" " .previous\n" " .section __ex_table,\"a\"\n" - " .word 1b,8b\n" - " .word 2b,8b\n" - " .word 3b,8b\n" - " .word 4b,8b\n" - " .word 5b,8b\n" - " .word 6b,8b\n" - " .word 7b,8b\n" - " .word 0b,8b\n" + __stringify(PTR) " 1b,8b\n" + __stringify(PTR) " 2b,8b\n" + __stringify(PTR) " 3b,8b\n" + __stringify(PTR) " 4b,8b\n" + __stringify(PTR) " 5b,8b\n" + __stringify(PTR) " 6b,8b\n" + __stringify(PTR) " 7b,8b\n" + __stringify(PTR) " 0b,8b\n" " .previous\n" " .set pop\n" : "+&r"(rt), "=&r"(rs), @@ -1999,7 +1999,7 @@ fpu_emul: "j 2b\n" ".previous\n" ".section __ex_table,\"a\"\n" - ".word 1b, 3b\n" + __stringify(PTR) " 1b,3b\n" ".previous\n" : "=&r"(res), "+&r"(err) : "r"(vaddr), "i"(SIGSEGV) @@ -2057,7 +2057,7 @@ fpu_emul: "j 2b\n" ".previous\n" ".section __ex_table,\"a\"\n" - ".word 1b, 3b\n" + __stringify(PTR) " 1b,3b\n" ".previous\n" : "+&r"(res), "+&r"(err) : "r"(vaddr), "i"(SIGSEGV)); @@ -2118,7 +2118,7 @@ fpu_emul: "j 2b\n" ".previous\n" ".section __ex_table,\"a\"\n" - ".word 1b, 3b\n" + __stringify(PTR) " 1b,3b\n" ".previous\n" : "=&r"(res), "+&r"(err) : "r"(vaddr), "i"(SIGSEGV) @@ -2181,7 +2181,7 @@ fpu_emul: "j 2b\n" ".previous\n" ".section __ex_table,\"a\"\n" - ".word 1b, 3b\n" + __stringify(PTR) " 1b,3b\n" ".previous\n" : "+&r"(res), "+&r"(err) : "r"(vaddr), "i"(SIGSEGV)); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists