Commit e45f90fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fix from Russell King:
 "Just one bug fix: avoid a fortify panic when copying optprobe template"

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template
parents 88b31f07 9fa2e7af

arch/arm/include/asm/kprobes.h

+11 −11
Original line number Diff line number Diff line
@@ -44,20 +44,20 @@ int kprobe_exceptions_notify(struct notifier_block *self, 
			     unsigned long val, void *data);



/* optinsn template addresses */

extern __visible kprobe_opcode_t optprobe_template_entry;

extern __visible kprobe_opcode_t optprobe_template_val;

extern __visible kprobe_opcode_t optprobe_template_call;

extern __visible kprobe_opcode_t optprobe_template_end;

extern __visible kprobe_opcode_t optprobe_template_sub_sp;

extern __visible kprobe_opcode_t optprobe_template_add_sp;

extern __visible kprobe_opcode_t optprobe_template_restore_begin;

extern __visible kprobe_opcode_t optprobe_template_restore_orig_insn;

extern __visible kprobe_opcode_t optprobe_template_restore_end;

extern __visible kprobe_opcode_t optprobe_template_entry[];

extern __visible kprobe_opcode_t optprobe_template_val[];

extern __visible kprobe_opcode_t optprobe_template_call[];

extern __visible kprobe_opcode_t optprobe_template_end[];

extern __visible kprobe_opcode_t optprobe_template_sub_sp[];

extern __visible kprobe_opcode_t optprobe_template_add_sp[];

extern __visible kprobe_opcode_t optprobe_template_restore_begin[];

extern __visible kprobe_opcode_t optprobe_template_restore_orig_insn[];

extern __visible kprobe_opcode_t optprobe_template_restore_end[];



#define MAX_OPTIMIZED_LENGTH	4

#define MAX_OPTINSN_SIZE				\

	((unsigned long)&optprobe_template_end -	\

	 (unsigned long)&optprobe_template_entry)

	((unsigned long)optprobe_template_end -	\

	 (unsigned long)optprobe_template_entry)

#define RELATIVEJUMP_SIZE	4



struct arch_optimized_insn {

arch/arm/probes/kprobes/opt-arm.c

+9 −9
Original line number Diff line number Diff line
@@ -85,21 +85,21 @@ asm ( 
			"optprobe_template_end:\n");



#define TMPL_VAL_IDX \

	((unsigned long *)&optprobe_template_val - (unsigned long *)&optprobe_template_entry)

	((unsigned long *)optprobe_template_val - (unsigned long *)optprobe_template_entry)

#define TMPL_CALL_IDX \

	((unsigned long *)&optprobe_template_call - (unsigned long *)&optprobe_template_entry)

	((unsigned long *)optprobe_template_call - (unsigned long *)optprobe_template_entry)

#define TMPL_END_IDX \

	((unsigned long *)&optprobe_template_end - (unsigned long *)&optprobe_template_entry)

	((unsigned long *)optprobe_template_end - (unsigned long *)optprobe_template_entry)

#define TMPL_ADD_SP \

	((unsigned long *)&optprobe_template_add_sp - (unsigned long *)&optprobe_template_entry)

	((unsigned long *)optprobe_template_add_sp - (unsigned long *)optprobe_template_entry)

#define TMPL_SUB_SP \

	((unsigned long *)&optprobe_template_sub_sp - (unsigned long *)&optprobe_template_entry)

	((unsigned long *)optprobe_template_sub_sp - (unsigned long *)optprobe_template_entry)

#define TMPL_RESTORE_BEGIN \

	((unsigned long *)&optprobe_template_restore_begin - (unsigned long *)&optprobe_template_entry)

	((unsigned long *)optprobe_template_restore_begin - (unsigned long *)optprobe_template_entry)

#define TMPL_RESTORE_ORIGN_INSN \

	((unsigned long *)&optprobe_template_restore_orig_insn - (unsigned long *)&optprobe_template_entry)

	((unsigned long *)optprobe_template_restore_orig_insn - (unsigned long *)optprobe_template_entry)

#define TMPL_RESTORE_END \

	((unsigned long *)&optprobe_template_restore_end - (unsigned long *)&optprobe_template_entry)

	((unsigned long *)optprobe_template_restore_end - (unsigned long *)optprobe_template_entry)



/*

 * ARM can always optimize an instruction when using ARM ISA, except
@@ -234,7 +234,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *or 
	}



	/* Copy arch-dep-instance from template. */

	memcpy(code, (unsigned long *)&optprobe_template_entry,

	memcpy(code, (unsigned long *)optprobe_template_entry,

			TMPL_END_IDX * sizeof(kprobe_opcode_t));



	/* Adjust buffer according to instruction. */