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

Commit 59078d4b authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

uprobes/x86: Kill the "ia32_compat" check in handle_riprel_insn(), remove "mm" arg 



Kill the "mm->context.ia32_compat" check in handle_riprel_insn(), if
it is true insn_rip_relative() must return false. validate_insn_bits()
passed "ia32_compat" as !x86_64 to insn_init(), and insn_rip_relative()
checks insn->x86_64.

Also, remove the no longer needed "struct mm_struct *mm" argument and
the unnecessary "return" at the end.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Reviewed-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Reviewed-by: default avatarJim Keniston <jkenisto@us.ibm.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
parent ddb69f27

arch/x86/kernel/uprobes.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -253,14 +253,11 @@ static int validate_insn_32bits(struct arch_uprobe *auprobe, struct insn *insn) 
 *  - The displacement is always 4 bytes.

 *  - The displacement is always 4 bytes.

 */

 */

static void

static void

handle_riprel_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, struct insn *insn)

handle_riprel_insn(struct arch_uprobe *auprobe, struct insn *insn)

{

{

	u8 *cursor;

	u8 *cursor;

	u8 reg;

	u8 reg;





	if (mm->context.ia32_compat)

		return;



	if (!insn_rip_relative(insn))

	if (!insn_rip_relative(insn))

		return;

		return;
@@ -314,7 +311,6 @@ handle_riprel_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, struct ins 
		cursor++;

		cursor++;

		memmove(cursor, cursor + insn->displacement.nbytes, insn->immediate.nbytes);

		memmove(cursor, cursor + insn->displacement.nbytes, insn->immediate.nbytes);

	}

	}

	return;

}

}





static int validate_insn_64bits(struct arch_uprobe *auprobe, struct insn *insn)

static int validate_insn_64bits(struct arch_uprobe *auprobe, struct insn *insn)
@@ -343,7 +339,7 @@ static int validate_insn_bits(struct arch_uprobe *auprobe, struct mm_struct *mm, 
	return validate_insn_64bits(auprobe, insn);

	return validate_insn_64bits(auprobe, insn);

}

}

#else /* 32-bit: */

#else /* 32-bit: */

static void handle_riprel_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, struct insn *insn)

static void handle_riprel_insn(struct arch_uprobe *auprobe, struct insn *insn)

{

{

	/* No RIP-relative addressing on 32-bit */

	/* No RIP-relative addressing on 32-bit */

}

}
@@ -376,7 +372,7 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, 
	 * and annotate arch_uprobe->fixups accordingly. To start with, ->fixups

	 * and annotate arch_uprobe->fixups accordingly. To start with, ->fixups

	 * is either zero or it reflects rip-related fixups.

	 * is either zero or it reflects rip-related fixups.

	 */

	 */

	handle_riprel_insn(auprobe, mm, &insn);

	handle_riprel_insn(auprobe, &insn);





	switch (OPCODE1(&insn)) {

	switch (OPCODE1(&insn)) {

	case 0x9d:		/* popf */

	case 0x9d:		/* popf */