Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d6ed89e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "arm64: probes: Fix uprobes for big-endian kernels" 



This reverts commit e6ab3362 which is
commit 13f8f1e05f1dc36dbba6cba0ae03354c0dafcde7 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Iddbda00bfb1246f4ddf99af31d251287784ec5b7
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 73ec729f

arch/arm64/include/asm/uprobes.h

+5 −3
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ 
#include <asm/insn.h>

#include <asm/probes.h>



#define MAX_UINSN_BYTES		AARCH64_INSN_SIZE



#define UPROBE_SWBP_INSN	cpu_to_le32(BRK64_OPCODE_UPROBES)

#define UPROBE_SWBP_INSN_SIZE	AARCH64_INSN_SIZE

#define UPROBE_XOL_SLOT_BYTES	AARCH64_INSN_SIZE

#define UPROBE_XOL_SLOT_BYTES	MAX_UINSN_BYTES



typedef u32 uprobe_opcode_t;
@@ -21,8 +23,8 @@ struct arch_uprobe_task { 


struct arch_uprobe {

	union {

		__le32 insn;

		__le32 ixol;

		u8 insn[MAX_UINSN_BYTES];

		u8 ixol[MAX_UINSN_BYTES];

	};

	struct arch_probe_insn api;

	bool simulate;

arch/arm64/kernel/probes/uprobes.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, 
	else if (!IS_ALIGNED(addr, AARCH64_INSN_SIZE))

		return -EINVAL;



	insn = le32_to_cpu(auprobe->insn);

	insn = *(probe_opcode_t *)(&auprobe->insn[0]);



	switch (arm_probe_decode_insn(insn, &auprobe->api)) {

	case INSN_REJECTED:
@@ -108,7 +108,7 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs) 
	if (!auprobe->simulate)

		return false;



	insn = le32_to_cpu(auprobe->insn);

	insn = *(probe_opcode_t *)(&auprobe->insn[0]);

	addr = instruction_pointer(regs);



	if (auprobe->api.handler)