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

Commit f438d914 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Linus Torvalds
Browse files

kprobes: support kretprobe blacklist 



Introduce architecture dependent kretprobe blacklists to prohibit users
from inserting return probes on the function in which kprobes can be
inserted but kretprobes can not.

This patch also removes "__kprobes" mark from "__switch_to" on x86_64 and
registers "__switch_to" to the blacklist on x86-64, because that mark is to
prohibit user from inserting only kretprobe.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Cc: Prasanna S Panchamukhi <prasanna@in.ibm.com>
Acked-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 49dce689

arch/avr32/kernel/kprobes.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ DEFINE_PER_CPU(struct kprobe *, current_kprobe); 
static unsigned long kprobe_status;

static struct pt_regs jprobe_saved_regs;



struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};



int __kprobes arch_prepare_kprobe(struct kprobe *p)

{

	int ret = 0;

arch/ia64/kernel/kprobes.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ extern void jprobe_inst_return(void); 
DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;

DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);



struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};



enum instruction_type {A, I, M, F, B, L, X, u};

static enum instruction_type bundle_encoding[32][3] = {

  { M, I, I },				/* 00 */

arch/powerpc/kernel/kprobes.c

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 
DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;

DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);



struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};



int __kprobes arch_prepare_kprobe(struct kprobe *p)

{

	int ret = 0;

arch/s390/kernel/kprobes.c

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;

DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);



struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};



int __kprobes arch_prepare_kprobe(struct kprobe *p)

{

	/* Make sure the probe isn't going on a difficult instruction */

arch/sparc64/kernel/kprobes.c

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;

DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);



struct kretprobe_blackpoint kretprobe_blacklist[] = {{NULL, NULL}};



int __kprobes arch_prepare_kprobe(struct kprobe *p)

{

	p->ainsn.insn[0] = *p->addr;