From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: John Hubbard <jhubbard@nvidia.com>
Cc: John S Gruber <johnsgruber@gmail.com>,
stable@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
"H . Peter Anvin" <hpa@zytor.com>, x86-ml <x86@kernel.org>
Subject: Re: [PATCH] x86/boot: v4.4 stable and v4.9 stable boot failure due to dropped patch line
Date: Sat, 21 Sep 2019 06:27:08 +0200 [thread overview]
Message-ID: <20190921042708.GA989495@kroah.com> (raw)
In-Reply-To: <6c0cf9d6-852e-aea2-6bde-a5f5068ea236@nvidia.com>
On Fri, Sep 20, 2019 at 06:38:23PM -0700, John Hubbard wrote:
> On 9/20/19 6:06 PM, John S Gruber wrote:
> > This regards upstream commit a90118c445cc ("x86/boot: Save fields
> > explicitly, zero out everything else") application to linux-stable.
> >
> > Its corresponding commits to the stable 4.4 and 4.9 trees didn't apply
> > correctly, probably due to a field name change (e820_table had been named
> > e820_map before 4.10).
> >
> > On my desktop I'm unable to boot a signed kernel due to these commits.
> >
> > Add e820_map (to replace e820_table) to the preserved fields so that the
> > E820 memory regions in boot_params can be accessed by the kernel after
> > boot_params has been sanitized.
> >
> > Signed-off-by: John S Gruber <JohnSGruber@gmail.com>
> > Fixes: 41664b97f46e ("x86/boot: Save fields explicitly, zero out everything else")
> > Fixes: 4e478cb2ccdd ("x86/boot: Save fields explicitly, zero out everything else")
> > Link: https://lore.kernel.org/lkml/20190731054627.5627-2-jhubbard@nvidia.com/
> > ---
> >
> > I tested stable 4.14.145, 4.19.74, and 5.2.16 successfully under the same
> > circumstances. Only 4.4 and 4.9 are affected by this dropped line.
> >
> > arch/x86/include/asm/bootparam_utils.h | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h
> > index 0232b5a..588d8fb 100644
> > --- a/arch/x86/include/asm/bootparam_utils.h
> > +++ b/arch/x86/include/asm/bootparam_utils.h
> > @@ -71,6 +71,7 @@ static void sanitize_boot_params(struct boot_params *boot_params)
> > BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),
> > BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),
> > BOOT_PARAM_PRESERVE(hdr),
> > + BOOT_PARAM_PRESERVE(e820_map),
> > BOOT_PARAM_PRESERVE(eddbuf),
> > };
> >
> >
>
> Reviewed-by: John Hubbard <jhubbard@nvidia.com>
>
> Thanks for getting -stable figured out and fixed--this has not been smooth sailing!
This change is already in the 4.4.y-rc and 4.9.y-rc releases that went
out two days ago for review. So this should be fixed in the next
release. If not, please let me know.
thanks,
greg k-h
prev parent reply other threads:[~2019-09-21 4:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190731054627.5627-2-jhubbard@nvidia.com>
[not found] ` <CAPotdmTa-cAeTVkHkRWj0x27b0ME0X7=YMkfdGkBRoEk5zUw+w@mail.gmail.com>
2019-09-01 18:36 ` [PATCH] x86/boot: Fix regression--secure boot info loss from bootparam sanitizing John Hubbard
2019-09-01 22:00 ` [PATCH V2] " John S Gruber
2019-09-02 7:23 ` Borislav Petkov
2019-09-02 8:17 ` [tip: x86/urgent] x86/boot: Preserve boot_params.secure_boot from sanitizing tip-bot2 for John S. Gruber
2019-09-21 1:06 ` [PATCH] x86/boot: v4.4 stable and v4.9 stable boot failure due to dropped patch line John S Gruber
2019-09-21 1:38 ` John Hubbard
2019-09-21 4:27 ` Greg Kroah-Hartman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190921042708.GA989495@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jhubbard@nvidia.com \
--cc=johnsgruber@gmail.com \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).