linux-kernel - [PATCH 1/1] Fix: arm: kprobes: optimized kprobes illegal instruction

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20190205152806.20340-1-mathieu.desnoyers@efficios.com>
Date:   Tue,  5 Feb 2019 10:28:06 -0500
From:   Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
To:     patches@...linux.org.uk
Cc:     linux-kernel@...r.kernel.org,
        Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
        Robert Berger <Robert.Berger@...iableEmbeddedSystems.com>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        William Cohen <wcohen@...hat.com>,
        Laura Abbott <labbott@...hat.com>,
        Kees Cook <keescook@...omium.org>,
        Russell King <rmk+kernel@...linux.org.uk>,
        "# v4 . 14+" <stable@...r.kernel.org>,
        linux-arm-kernel@...ts.infradead.org
Subject: [PATCH 1/1] Fix: arm: kprobes: optimized kprobes illegal instruction

commit e46daee53bb5 ("ARM: 8806/1: kprobes: Fix false positive with
FORTIFY_SOURCE") introduced a regression in optimized kprobes. It
triggers "invalid instruction" oopses when using kprobes instrumentation
through lttng and perf. This commit was introduced in kernel v4.20, and
has been backported to stable kernels 4.19 and 4.14.

This crash was also reported by Hongzhi Song on the redhat bugzilla
where the patch was originally introduced.

Link: https://bugzilla.redhat.com/show_bug.cgi?id=1639397
Link: https://bugs.lttng.org/issues/1174
Link: https://lore.kernel.org/lkml/342740659.2887.1549307721609.JavaMail.zimbra@efficios.com
Fixes: e46daee53bb5 ("ARM: 8806/1: kprobes: Fix false positive with FORTIFY_SOURCE")
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
Reported-by: Robert Berger <Robert.Berger@...iableEmbeddedSystems.com>
Tested-by: Robert Berger <Robert.Berger@...iableEmbeddedSystems.com>
Acked-by: Kees Cook <keescook@...omium.org>
CC: Robert Berger <Robert.Berger@...iableEmbeddedSystems.com>
CC: Masami Hiramatsu <mhiramat@...nel.org>
CC: William Cohen <wcohen@...hat.com>
CC: Laura Abbott <labbott@...hat.com>
CC: Kees Cook <keescook@...omium.org>
CC: Russell King <rmk+kernel@...linux.org.uk>
CC: <stable@...r.kernel.org> # v4.14+
CC: linux-arm-kernel@...ts.infradead.org
CC: patches@...linux.org.uk
---
 arch/arm/probes/kprobes/opt-arm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/probes/kprobes/opt-arm.c b/arch/arm/probes/kprobes/opt-arm.c
index 2c118a6ab358..0dc23fc227ed 100644
--- a/arch/arm/probes/kprobes/opt-arm.c
+++ b/arch/arm/probes/kprobes/opt-arm.c
@@ -247,7 +247,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *or
 	}
 
 	/* Copy arch-dep-instance from template. */
-	memcpy(code, (unsigned char *)optprobe_template_entry,
+	memcpy(code, (unsigned long *)&optprobe_template_entry,
 			TMPL_END_IDX * sizeof(kprobe_opcode_t));
 
 	/* Adjust buffer according to instruction. */
-- 
2.11.0