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

kprobes: treewide: Cleanup the error messages for kprobes 

This clean up the error/notification messages in kprobes related code.
Basically this defines 'pr_fmt()' macros for each files and update
the messages which describes

 - what happened,
 - what is the kernel going to do or not do,
 - is the kernel fine,
 - what can the user do about it.

Also, if the message is not needed (e.g. the function returns unique
error code, or other error message is already shown.) remove it,
and replace the message with WARN_*() macros if suitable.

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



Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 4402deae

arch/arm/probes/kprobes/core.c

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * Copyright (C) 2007 Marvell Ltd.

 */



#define pr_fmt(fmt) "kprobes: " fmt



#include <linux/kernel.h>

#include <linux/kprobes.h>

#include <linux/module.h>
@@ -278,7 +280,7 @@ void __kprobes kprobe_handler(struct pt_regs *regs) 
				break;

			case KPROBE_REENTER:

				/* A nested probe was hit in FIQ, it is a BUG */

				pr_warn("Unrecoverable kprobe detected.\n");

				pr_warn("Failed to recover from reentered kprobes.\n");

				dump_kprobe(p);

				fallthrough;

			default:

arch/arm64/kernel/probes/kprobes.c

+4 −1
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ 
 * Copyright (C) 2013 Linaro Limited.

 * Author: Sandeepa Prabhu <sandeepa.prabhu@linaro.org>

 */



#define pr_fmt(fmt) "kprobes: " fmt



#include <linux/extable.h>

#include <linux/kasan.h>

#include <linux/kernel.h>
@@ -218,7 +221,7 @@ static int __kprobes reenter_kprobe(struct kprobe *p, 
		break;

	case KPROBE_HIT_SS:

	case KPROBE_REENTER:

		pr_warn("Unrecoverable kprobe detected.\n");

		pr_warn("Failed to recover from reentered kprobes.\n");

		dump_kprobe(p);

		BUG();

		break;

arch/csky/kernel/probes/kprobes.c

+5 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+



#define pr_fmt(fmt) "kprobes: " fmt



#include <linux/kprobes.h>

#include <linux/extable.h>

#include <linux/slab.h>
@@ -77,10 +79,8 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
{

	unsigned long probe_addr = (unsigned long)p->addr;



	if (probe_addr & 0x1) {

		pr_warn("Address not aligned.\n");

		return -EINVAL;

	}

	if (probe_addr & 0x1)

		return -EILSEQ;



	/* copy instruction */

	p->opcode = le32_to_cpu(*p->addr);
@@ -225,7 +225,7 @@ static int __kprobes reenter_kprobe(struct kprobe *p, 
		break;

	case KPROBE_HIT_SS:

	case KPROBE_REENTER:

		pr_warn("Unrecoverable kprobe detected.\n");

		pr_warn("Failed to recover from reentered kprobes.\n");

		dump_kprobe(p);

		BUG();

		break;

arch/mips/kernel/kprobes.c

+5 −6
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 *   Copyright (C) IBM Corporation, 2002, 2004

 */



#define pr_fmt(fmt) "kprobes: " fmt



#include <linux/kprobes.h>

#include <linux/preempt.h>

#include <linux/uaccess.h>
@@ -80,8 +82,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
	insn = p->addr[0];



	if (insn_has_ll_or_sc(insn)) {

		pr_notice("Kprobes for ll and sc instructions are not"

			  "supported\n");

		pr_notice("Kprobes for ll and sc instructions are not supported\n");

		ret = -EINVAL;

		goto out;

	}
@@ -219,7 +220,7 @@ static int evaluate_branch_instruction(struct kprobe *p, struct pt_regs *regs, 
	return 0;



unaligned:

	pr_notice("%s: unaligned epc - sending SIGBUS.\n", current->comm);

	pr_notice("Failed to emulate branch instruction because of unaligned epc - sending SIGBUS to %s.\n", current->comm);

	force_sig(SIGBUS);

	return -EFAULT;
@@ -238,11 +239,9 @@ static void prepare_singlestep(struct kprobe *p, struct pt_regs *regs, 
		regs->cp0_epc = (unsigned long)p->addr;

	else if (insn_has_delayslot(p->opcode)) {

		ret = evaluate_branch_instruction(p, regs, kcb);

		if (ret < 0) {

			pr_notice("Kprobes: Error in evaluating branch\n");

		if (ret < 0)

			return;

	}

	}

	regs->cp0_epc = (unsigned long)&p->ainsn.insn[0];

}

arch/riscv/kernel/probes/kprobes.c

+5 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+



#define pr_fmt(fmt) "kprobes: " fmt



#include <linux/kprobes.h>

#include <linux/extable.h>

#include <linux/slab.h>
@@ -50,11 +52,8 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
{

	unsigned long probe_addr = (unsigned long)p->addr;



	if (probe_addr & 0x1) {

		pr_warn("Address not aligned.\n");



		return -EINVAL;

	}

	if (probe_addr & 0x1)

		return -EILSEQ;



	/* copy instruction */

	p->opcode = *p->addr;
@@ -191,7 +190,7 @@ static int __kprobes reenter_kprobe(struct kprobe *p, 
		break;

	case KPROBE_HIT_SS:

	case KPROBE_REENTER:

		pr_warn("Unrecoverable kprobe detected.\n");

		pr_warn("Failed to recover from reentered kprobes.\n");

		dump_kprobe(p);

		BUG();

		break;