Re: [PATCH bpf-next v3 1/4] x86/ibt: factor out cfi and fineibt offset

From: Peter Zijlstra
Date: Mon Mar 03 2025 - 06:35:46 EST


On Mon, Mar 03, 2025 at 06:51:41PM +0800, Menglong Dong wrote:
> On Mon, Mar 3, 2025 at 5:18 PM Peter Zijlstra <peterz@xxxxxxxxxxxxx> wrote:
> >
> > On Mon, Mar 03, 2025 at 02:53:42PM +0800, Menglong Dong wrote:
> > > index c71b575bf229..ad050d09cb2b 100644
> > > --- a/arch/x86/kernel/alternative.c
> > > +++ b/arch/x86/kernel/alternative.c
> > > @@ -908,7 +908,7 @@ void __init_or_module noinline apply_seal_endbr(s32 *start, s32 *end, struct mod
> > >
> > > poison_endbr(addr, wr_addr, true);
> > > if (IS_ENABLED(CONFIG_FINEIBT))
> > > - poison_cfi(addr - 16, wr_addr - 16);
> > > + poison_cfi(addr, wr_addr);
> > > }
> > > }
> >
> > If you're touching this code, please use tip/x86/core or tip/master.
>
> Thank you for reminding me that, I were using the linux-next, and

That must've been an very old -next, because that wr_addr crap has been
gone a while now.

Anyway, thanks for moving to a newer tree!