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

Commit 4712e17a authored by Ben Dooks's avatar Ben Dooks Committed by Taras Kondratiuk
Browse files

ARM: kprobes-test: use <asm/opcodes.h> for instruction accesses 



Ensure we read instructions in the correct endian-ness by using
the <asm/opcodes.h> helper to transform them as necessary.

Acked-by: default avatarJon Medhurst <tixy@linaro.org>
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
[taras.kondratiuk@linaro.org: fix next_instruction() function]
Signed-off-by: default avatarTaras Kondratiuk <taras.kondratiuk@linaro.org>
parent 888be254

arch/arm/kernel/kprobes-test.c

+6 −5
Original line number Diff line number Diff line
@@ -1333,7 +1333,8 @@ static void test_case_failed(const char *message) 
static unsigned long next_instruction(unsigned long pc)

{

#ifdef CONFIG_THUMB2_KERNEL

	if ((pc & 1) && !is_wide_instruction(*(u16 *)(pc - 1)))

	if ((pc & 1) &&

	    !is_wide_instruction(__mem_to_opcode_thumb16(*(u16 *)(pc - 1))))

		return pc + 2;

	else

#endif
@@ -1378,13 +1379,13 @@ static uintptr_t __used kprobes_test_case_start(const char *title, void *stack) 


	if (test_case_is_thumb) {

		u16 *p = (u16 *)(test_code & ~1);

		current_instruction = p[0];

		current_instruction = __mem_to_opcode_thumb16(p[0]);

		if (is_wide_instruction(current_instruction)) {

			current_instruction <<= 16;

			current_instruction |= p[1];

			u16 instr2 = __mem_to_opcode_thumb16(p[1]);

			current_instruction = __opcode_thumb32_compose(current_instruction, instr2);

		}

	} else {

		current_instruction = *(u32 *)test_code;

		current_instruction = __mem_to_opcode_arm(*(u32 *)test_code);

	}



	if (current_title[0] == '.')