From 909633957d85561dab7655d69a9d17dd16231d92 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Tue, 25 Nov 2014 10:05:35 +0000 Subject: [PATCH] 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 Signed-off-by: Will Deacon --- arch/arm64/kernel/armv8_deprecated.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c index 529aad93336f..c363671d7509 100644 --- a/arch/arm64/kernel/armv8_deprecated.c +++ b/arch/arm64/kernel/armv8_deprecated.c @@ -165,7 +165,7 @@ static int emulation_proc_handler(struct ctl_table *table, int write, 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);