Received-SPF: pass (google.com: domain of linux-kernel+bounces-14603-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <20231226140250.224516-1-ytcoode@gmail.com> <CAMj1kXGE9JUoPUqBMJkwVUco67dEa8N95=gMJwE+Sj1ux1+5tQ@mail.gmail.com>
 <b2c4835d-0076-47f0-b0d1-792dc32cc305@amd.com>
In-Reply-To: <b2c4835d-0076-47f0-b0d1-792dc32cc305@amd.com>
From: Ard Biesheuvel <ardb@kernel.org>
Date: Tue, 2 Jan 2024 17:26:58 +0100
Message-ID: <CAMj1kXELiSzz75EGJuYwvSURfjGmZaRLEQghvGVVc5JMN+Npow@mail.gmail.com>
Subject: Re: [PATCH] x86/efistub: fix the missing KASLR_FLAG bit in boot_params->hdr.loadflags
To: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Yuntao Wang <ytcoode@gmail.com>, linux-efi@vger.kernel.org, 
	linux-kernel@vger.kernel.org, "Borislav Petkov (AMD)" <bp@alien8.de>, 
	"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Ingo Molnar <mingo@kernel.org>, 
	Dionna Glaze <dionnaglaze@google.com>, Nikolay Borisov <nik.borisov@suse.com>
Content-Type: text/plain; charset="UTF-8"

On Tue, 2 Jan 2024 at 17:26, Tom Lendacky <thomas.lendacky@amd.com> wrote:
>
> On 1/2/24 09:29, Ard Biesheuvel wrote:
> > On Tue, 26 Dec 2023 at 15:03, Yuntao Wang <ytcoode@gmail.com> wrote:
> >>
> >> When KASLR is enabled, the KASLR_FLAG bit in boot_params->hdr.loadflags
> >> should be set to 1 to propagate KASLR status from compressed kernel to
> >> kernel, just as the choose_random_location() function does.
> >>
> >> Currently, when kernel is booted via efi stub, the KASLR_FLAG bit in
> >> boot_params->hdr.loadflags is not set, even though it should be. This
> >> causes some functions, such as kernel_randomize_memory(), not to execute
> >> as expected. Fix it.
> >>
> >> Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
> >> ---
> >>   drivers/firmware/efi/libstub/x86-stub.c | 5 ++++-
> >>   1 file changed, 4 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
> >> index da9b7b8d0716..b0c68593ad40 100644
> >> --- a/drivers/firmware/efi/libstub/x86-stub.c
> >> +++ b/drivers/firmware/efi/libstub/x86-stub.c
> >> @@ -787,7 +787,10 @@ static efi_status_t efi_decompress_kernel(unsigned long *kernel_entry)
> >>                          efi_debug("AMI firmware v2.0 or older detected - disabling physical KASLR\n");
> >>                          seed[0] = 0;
> >>                  }
> >> -       }
> >> +
> >> +               boot_params_ptr->hdr.loadflags |= KASLR_FLAG;
> >> +       } else
> >> +               boot_params_ptr->hdr.loadflags &= ~KASLR_FLAG;
> >>
> >
> > Thanks for the fix.
>
> Does it need a Fixes: tag?
>

Yes, I've added that.