Commit adf8a61a authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

kprobes: treewide: Make it harder to refer kretprobe_trampoline directly 

Since now there is kretprobe_trampoline_addr() for referring the
address of kretprobe trampoline code, we don't need to access
kretprobe_trampoline directly.

Make it harder to refer by renaming it to __kretprobe_trampoline().

Link: https://lkml.kernel.org/r/163163045446.489837.14510577516938803097.stgit@devnote2



Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 96fed8ac

arch/arc/include/asm/kprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct kprobe_ctlblk { 
};



int kprobe_fault_handler(struct pt_regs *regs, unsigned long cause);

void kretprobe_trampoline(void);

void __kretprobe_trampoline(void);

void trap_is_kprobe(unsigned long address, struct pt_regs *regs);

#else

#define trap_is_kprobe(address, regs)

arch/arc/kernel/kprobes.c

+6 −5
Original line number Diff line number Diff line
@@ -363,8 +363,9 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, 


static void __used kretprobe_trampoline_holder(void)

{

	__asm__ __volatile__(".global kretprobe_trampoline\n"

			     "kretprobe_trampoline:\n" "nop\n");

	__asm__ __volatile__(".global __kretprobe_trampoline\n"

			     "__kretprobe_trampoline:\n"

			     "nop\n");

}



void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
@@ -375,7 +376,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, 
	ri->fp = NULL;



	/* Replace the return addr with trampoline addr */

	regs->blink = (unsigned long)&kretprobe_trampoline;

	regs->blink = (unsigned long)&__kretprobe_trampoline;

}



static int __kprobes trampoline_probe_handler(struct kprobe *p,
@@ -390,7 +391,7 @@ static int __kprobes trampoline_probe_handler(struct kprobe *p, 
}



static struct kprobe trampoline_p = {

	.addr = (kprobe_opcode_t *) &kretprobe_trampoline,

	.addr = (kprobe_opcode_t *) &__kretprobe_trampoline,

	.pre_handler = trampoline_probe_handler

};
@@ -402,7 +403,7 @@ int __init arch_init_kprobes(void) 


int __kprobes arch_trampoline_kprobe(struct kprobe *p)

{

	if (p->addr == (kprobe_opcode_t *) &kretprobe_trampoline)

	if (p->addr == (kprobe_opcode_t *) &__kretprobe_trampoline)

		return 1;



	return 0;

arch/arm/probes/kprobes/core.c

+3 −3
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, 
 * for kretprobe handlers which should normally be interested in r0 only

 * anyway.

 */

void __naked __kprobes kretprobe_trampoline(void)

void __naked __kprobes __kretprobe_trampoline(void)

{

	__asm__ __volatile__ (

		"stmdb	sp!, {r0 - r11}		\n\t"
@@ -389,7 +389,7 @@ void __naked __kprobes kretprobe_trampoline(void) 
		: : : "memory");

}



/* Called from kretprobe_trampoline */

/* Called from __kretprobe_trampoline */

static __used __kprobes void *trampoline_handler(struct pt_regs *regs)

{

	return (void *)kretprobe_trampoline_handler(regs, (void *)regs->ARM_fp);
@@ -402,7 +402,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, 
	ri->fp = (void *)regs->ARM_fp;



	/* Replace the return addr with trampoline addr. */

	regs->ARM_lr = (unsigned long)&kretprobe_trampoline;

	regs->ARM_lr = (unsigned long)&__kretprobe_trampoline;

}



int __kprobes arch_trampoline_kprobe(struct kprobe *p)

arch/arm64/include/asm/kprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void arch_remove_kprobe(struct kprobe *); 
int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr);

int kprobe_exceptions_notify(struct notifier_block *self,

			     unsigned long val, void *data);

void kretprobe_trampoline(void);

void __kretprobe_trampoline(void);

void __kprobes *trampoline_probe_handler(struct pt_regs *regs);



#endif /* CONFIG_KPROBES */

arch/arm64/kernel/probes/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, 
	ri->fp = (void *)kernel_stack_pointer(regs);



	/* replace return addr (x30) with trampoline */

	regs->regs[30] = (long)&kretprobe_trampoline;

	regs->regs[30] = (long)&__kretprobe_trampoline;

}



int __kprobes arch_trampoline_kprobe(struct kprobe *p)