Re: [PATCH for review] [145/145] i386: Disallow kprobes on NMI handlers

[Chuck Ebbert]

In-Reply-To: <200608110853.19740.ak@xxxxxxx>

On Fri, 11 Aug 2006 08:53:19 +0200, Andi Kleen wrote:

> > > --- linux.orig/arch/i386/kernel/entry.S
> > > +++ linux/arch/i386/kernel/entry.S
> > > @@ -725,7 +725,7 @@ debug_stack_correct:
> > >   * check whether we got an NMI on the debug path where the debug
> > >   * fault happened on the sysenter path.
> > >   */
> > > -ENTRY(nmi)
> > > +KPROBE_ENTRY(nmi)
> > >       RING0_INT_FRAME
> > >       pushl %eax
> > >       CFI_ADJUST_CFA_OFFSET 4
> > 
> > Needs .popsection at the end of the NMI code.
> 
> This is fixed up in a later patch I think.
> i386: KPROBE_ENTRY ends up putting code into .fixup

That patch was earlier, not later.  I applied the 060811 patchset from
firstfloor and you still need this:

--- 2.6.18-rc4-ff.orig/arch/i386/kernel/entry.S
+++ 2.6.18-rc4-ff/arch/i386/kernel/entry.S
@@ -801,6 +801,7 @@ nmi_16bit_stack:
 	.align 4
 	.long 1b,iret_exc
 .previous
+.popsection
 
 KPROBE_ENTRY(int3)
 	RING0_INT_FRAME
-- 
Chuck
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/