[patch added to 3.12-stable] ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup

From	Jiri Slaby <jslaby@suse.cz>
Newsgroups	linux.kernel
Subject	[patch added to 3.12-stable] ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup
Date	2017-02-16 11:40 +0100
Message-ID	<tbrDI-4Tz-5@gated-at.bofh.it> (permalink)
References	<tbrDI-4Tz-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Vineet Gupta <Vineet.Gupta1@synopsys.com>

This patch has been added to the 3.12 stable tree. If you have any
objections, please let us know.

===============

commit a524c218bc94c705886a0e0fedeee45d1931da32 upstream.

Reported-by: Jo-Philipp Wich <jo@mein.io>
Fixes: 9aed02feae57bf7 ("ARC: [arcompact] handle unaligned access delay slot")
Cc: linux-kernel@vger.kernel.org
Cc: linux-snps-arc@lists.infradead.org
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 arch/arc/kernel/unaligned.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arc/kernel/unaligned.c b/arch/arc/kernel/unaligned.c
index dbde997d16c6..2cc82b6ec23d 100644
--- a/arch/arc/kernel/unaligned.c
+++ b/arch/arc/kernel/unaligned.c
@@ -242,7 +242,7 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs,
 
 	/* clear any remanants of delay slot */
 	if (delay_mode(regs)) {
-		regs->ret = regs->bta ~1U;
+		regs->ret = regs->bta & ~1U;
 		regs->status32 &= ~STATUS_DE_MASK;
 	} else {
 		regs->ret += state.instr_len;
-- 
2.11.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[patch added to 3.12-stable] ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup Jiri Slaby <jslaby@suse.cz> - 2017-02-16 11:40 +0100

csiph-web