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

Commit 50a011f6 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

kprobes/x86: Move skip_singlestep up 



I get this warning:

  arch/x86/kernel/kprobes.c:544:23: warning: ‘skip_singlestep’ declared ‘static’ but never defined

on tip/auto-latest.

Put the skip_singlestep function declaration up, in
KPROBES_CAN_USE_FTRACE and drop the superfluous forward
declaration.

Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1348145034-16603-1-git-send-email-bp@amd64.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1e6dd8ad

arch/x86/kernel/kprobes.c

+16 −16
Original line number Diff line number Diff line
@@ -541,8 +541,23 @@ reenter_kprobe(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb 
	return 1;

}



#ifdef KPROBES_CAN_USE_FTRACE

static void __kprobes skip_singlestep(struct kprobe *p, struct pt_regs *regs,

				      struct kprobe_ctlblk *kcb);

				      struct kprobe_ctlblk *kcb)

{

	/*

	 * Emulate singlestep (and also recover regs->ip)

	 * as if there is a 5byte nop

	 */

	regs->ip = (unsigned long)p->addr + MCOUNT_INSN_SIZE;

	if (unlikely(p->post_handler)) {

		kcb->kprobe_status = KPROBE_HIT_SSDONE;

		p->post_handler(p, regs, 0);

	}

	__this_cpu_write(current_kprobe, NULL);

}

#endif



/*

 * Interrupts are disabled on entry as trap3 is an interrupt gate and they

 * remain disabled throughout this function.
@@ -1061,21 +1076,6 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) 
}



#ifdef KPROBES_CAN_USE_FTRACE

static void __kprobes skip_singlestep(struct kprobe *p, struct pt_regs *regs,

				      struct kprobe_ctlblk *kcb)

{

	/*

	 * Emulate singlestep (and also recover regs->ip)

	 * as if there is a 5byte nop

	 */

	regs->ip = (unsigned long)p->addr + MCOUNT_INSN_SIZE;

	if (unlikely(p->post_handler)) {

		kcb->kprobe_status = KPROBE_HIT_SSDONE;

		p->post_handler(p, regs, 0);

	}

	__this_cpu_write(current_kprobe, NULL);

}



/* Ftrace callback handler for kprobes */

void __kprobes kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip,

				     struct ftrace_ops *ops, struct pt_regs *regs)