summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnanth N Mavinakayanahalli <ananth@in.ibm.com>2005-06-08 15:49:41 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 16:21:13 -0700
commit63224d1e8b4cf87cc7420201a8cb3b44b9bf0b40 (patch)
treeba7d897b1aeecb087d536b121176c10255bd1744 /arch
parent42442ed5744b03f5351a142649b8b4c97e6950ab (diff)
downloadlwn-63224d1e8b4cf87cc7420201a8cb3b44b9bf0b40.tar.gz
lwn-63224d1e8b4cf87cc7420201a8cb3b44b9bf0b40.zip
[PATCH] ppc64 kprobes: correct kprobe registration return values
Add stricter checks during kprobe registration. Return correct error value so insmod doesn't succeed. Also printk reason for registration failure. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc64/kernel/kprobes.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/ppc64/kernel/kprobes.c b/arch/ppc64/kernel/kprobes.c
index 5a9f47b18c45..8f3317244311 100644
--- a/arch/ppc64/kernel/kprobes.c
+++ b/arch/ppc64/kernel/kprobes.c
@@ -45,12 +45,17 @@ static struct pt_regs jprobe_saved_regs;
int arch_prepare_kprobe(struct kprobe *p)
{
+ int ret = 0;
kprobe_opcode_t insn = *p->addr;
- if (IS_MTMSRD(insn) || IS_RFID(insn))
- /* cannot put bp on RFID/MTMSRD */
- return 1;
- return 0;
+ if ((unsigned long)p->addr & 0x03) {
+ printk("Attempt to register kprobe at an unaligned address\n");
+ ret = -EINVAL;
+ } else if (IS_MTMSRD(insn) || IS_RFID(insn)) {
+ printk("Cannot register a kprobe on rfid or mtmsrd\n");
+ ret = -EINVAL;
+ }
+ return ret;
}
void arch_copy_kprobe(struct kprobe *p)