From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Scott Talbert <swt@techie.net>
Cc: linux-efi <linux-efi@vger.kernel.org>
Subject: Re: [PATCH] efi: don't iterate over EFI vars pointlessly if no SSDT override was specified
Date: Thu, 12 Sep 2019 21:42:28 +0100 [thread overview]
Message-ID: <CAKv+Gu95wtjPXRUF=wK3-Y6+zNcvaqpr+T4Z4-wV3OJH+oNgVg@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.21.1909121533270.30174@bear.techie.net>
On Thu, 12 Sep 2019 at 20:35, Scott Talbert <swt@techie.net> wrote:
>
> On Thu, 12 Sep 2019, Ard Biesheuvel wrote:
>
> > The kernel command line option efivar_ssdt= allows a EFI variable name
> > to be specified which contains an ACPI SSDT table that will be loaded
> > into memory by the OS.
> >
> > Currently, that code will always iterate over the EFI variables and
> > compare each name with the provided name, even if the command line
> > option wasn't set to begin with.
> >
> > So bail early when no variable name was provided.
> >
> > Cc: Scott Talbert <swt@techie.net>
> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > ---
> > drivers/firmware/efi/efi.c | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
> > index ad3b1f4866b3..8f020827cdd3 100644
> > --- a/drivers/firmware/efi/efi.c
> > +++ b/drivers/firmware/efi/efi.c
> > @@ -282,6 +282,9 @@ static __init int efivar_ssdt_load(void)
> > void *data;
> > int ret;
> >
> > + if (!efivar_ssdt[0])
> > + return 0;
> > +
> > ret = efivar_init(efivar_ssdt_iter, &entries, true, &entries);
> >
> > list_for_each_entry_safe(entry, aux, &entries, list) {
>
> Thanks for the quick fix!
>
> I can confirm this fixes booting on my Mac Pro 2012 system when applied to
> 5.3-rc7.
>
> Whenever this makes it in, if it could be targeted for the stable kernels
> as well, that would be appreciated.
>
I'll send it out as a fix with a cc to -stable.
Thanks,
Ard.
next prev parent reply other threads:[~2019-09-12 20:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-11 23:32 [PATCH] efi: don't iterate over EFI vars pointlessly if no SSDT override was specified Ard Biesheuvel
2019-09-12 19:35 ` Scott Talbert
2019-09-12 20:42 ` Ard Biesheuvel [this message]
2019-09-19 18:01 ` Scott Talbert
2019-09-25 15:57 ` Ard Biesheuvel
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='CAKv+Gu95wtjPXRUF=wK3-Y6+zNcvaqpr+T4Z4-wV3OJH+oNgVg@mail.gmail.com' \
--to=ard.biesheuvel@linaro.org \
--cc=linux-efi@vger.kernel.org \
--cc=swt@techie.net \
/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).