Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 13 Jul 2022 11:21:30 +0200
From:   Borislav Petkov <bp@suse.de>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Jiri Slaby <jirislaby@kernel.org>, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org,
        "Peter Zijlstra (Intel)" <peterz@infradead.org>,
        Josh Poimboeuf <jpoimboe@kernel.org>,
        Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Subject: Re: [PATCH 5.18 34/61] objtool: Update Retpoline validation
Message-ID: <Ys6OiDQCuP072GCX@nazgul.tnic>
References: <20220712183236.931648980@linuxfoundation.org>
 <20220712183238.342232911@linuxfoundation.org>
 <63e23f80-033f-f64e-7522-2816debbc367@kernel.org>
 <509dd891-73cc-31b9-18ac-2e930084c02f@kernel.org>
 <Ys5/ssHL076y4niP@kroah.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <Ys5/ssHL076y4niP@kroah.com>
Precedence: bulk

On Wed, Jul 13, 2022 at 10:17:54AM +0200, Greg Kroah-Hartman wrote:
> > A naive fix is:
> > --- a/arch/x86/kernel/head_32.S
> > +++ b/arch/x86/kernel/head_32.S
> > @@ -23,6 +23,7 @@
> >  #include <asm/cpufeatures.h>
> >  #include <asm/percpu.h>
> >  #include <asm/nops.h>
> > +#include <asm/nospec-branch.h>
> >  #include <asm/bootparam.h>
> >  #include <asm/export.h>
> >  #include <asm/pgtable_32.h>

Yap, pls send a proper patch.

> I doubt it should be doing that, but I'll let others answer more
> definitively.

I'd leave that question to the objtool folks.

Technically, the UNTRAIN_RET sequence is meant for both 32- and 64-bit
so there should be no reason not to mitigate that on 32-bit too. Not
that people should run 32-bit kernels...

> Your commit seems sane, for some reason I thought Boris tested i386
> builds, but maybe in the end something snuck in that broke it.

I caught one build breakage in relocate_kernel_32.S but this is a new
one.

Thx.

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
(HRB 36809, AG Nürnberg)