Skip to contentSkip to conversation

Kprobes: bugfix of kprobe-booster: reenable kprobe-booster

PATCH New Satoshi Oshima 1 participant 1 message May 19, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Kprobes: bugfix of kprobe-booster: reenable kprobe-booster

Hi Andrew,

I found a bug of kprobes in i386.

Kprobe-booster doesn't work if CONFIG_PREEMPT is not set. Because pre_preempt_count is always 0.

Boostability have been disabled when removing '#ifdef CONFIG_PREEMPT' I think.

This bug doesn't cause a kernel panic.

Regards,

Satoshi Oshima

arch/i386/kernel/kprobes.c +4 -0
diff -Narup linux-2.6.17-rc3-mm1.orig/arch/i386/kernel/kprobes.c kprobes-i386-bugfix/arch/i386/kernel/kprobes.c
@@ -257,7 +257,11 @@ static int __kprobes kprobe_handler(stru
 	int ret = 0;
 	kprobe_opcode_t *addr;
 	struct kprobe_ctlblk *kcb;
+#ifdef CONFIG_PREEMPT
 	unsigned pre_preempt_count = preempt_count();
+#else
+	unsigned pre_preempt_count = 1;
+#endif
 
 	addr = (kprobe_opcode_t *)(regs->eip - sizeof(kprobe_opcode_t));