Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753532AbdFSShB (ORCPT + 2 others); Mon, 19 Jun 2017 14:37:01 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:52395 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753477AbdFSSg6 (ORCPT ); Mon, 19 Jun 2017 14:36:58 -0400 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Vineet Gupta , linux-snps-arc@lists.infradead.org, Vineet Gupta , Linus Torvalds , Willy Tarreau Subject: [PATCH 3.10 141/268] ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup Date: Mon, 19 Jun 2017 20:30:40 +0200 Message-Id: <1497897167-14556-142-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1497897167-14556-1-git-send-email-w@1wt.eu> References: <1497897167-14556-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: From: Vineet Gupta commit a524c218bc94c705886a0e0fedeee45d1931da32 upstream. Reported-by: Jo-Philipp Wich 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 Signed-off-by: Linus Torvalds Signed-off-by: Willy Tarreau --- 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 b13b422..e6b365d 100644 --- a/arch/arc/kernel/unaligned.c +++ b/arch/arc/kernel/unaligned.c @@ -230,7 +230,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.8.0.rc2.1.gbe9624a