commit c5650ea788e45467ce5aa944829f3e6f72e6a9eb
author Will Deacon <will.deacon@arm.com> Tue Nov 25 10:05:35 2014 +0000
committer Ruchi Kandoi <kandoiruchi@google.com> Fri Feb 06 14:54:03 2015 -0800
tree d18246548bc878e6fd4fef58ad97d276a674c63f
parent 203077a7db3bc692ff8177e822110400868efab4

arm64: fix return code check when changing emulation handler

update_insn_emulation_mode() returns 0 on success, so we should be
treating any non-zero values as failure, rather than the other way
around. Otherwise, writes to the sysctl file controlling the emulation
are ignored and immediately rolled back.

Reported-by: Gene Hackmann <ghackmann@google.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

arch/arm64/kernel/armv8_deprecated.c

diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c
index 529aad9..c363671 100644
--- a/arch/arm64/kernel/armv8_deprecated.c
+++ b/arch/arm64/kernel/armv8_deprecated.c
@@ -165,7 +165,7 @@
 		goto ret;
 
 	ret = update_insn_emulation_mode(insn, prev_mode);
-	if (!ret) {
+	if (ret) {
 		/* Mode change failed, revert to previous mode. */
 		insn->current_mode = prev_mode;
 		update_insn_emulation_mode(insn, INSN_UNDEF);