From: Jonathan McDowell <noodles@fb.com>
To: Baoquan He <bhe@redhat.com>
Cc: Coiby Xu <coxu@redhat.com>, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"x86@kernel.org" <x86@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
Mimi Zohar <zohar@linux.ibm.com>,
Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-integrity@vger.kernel.org"
<linux-integrity@vger.kernel.org>,
"linux-security-module@vger.kernel.org"
<linux-security-module@vger.kernel.org>,
"kexec@lists.infradead.org" <kexec@lists.infradead.org>
Subject: Re: [PATCH v4] x86/kexec: Carry forward IMA measurement log on kexec
Date: Fri, 10 Jun 2022 09:52:01 +0000 [thread overview]
Message-ID: <YqMUPISvPs3ce1oi@noodles-fedora.dhcp.thefacebook.com> (raw)
In-Reply-To: <Yp19W4/ZQm/8U+BG@MiWiFi-R3L-srv>
On Mon, Jun 06, 2022 at 12:06:51PM +0800, Baoquan He wrote:
> On 05/12/22 at 04:25pm, Jonathan McDowell wrote:
> > On kexec file load Integrity Measurement Architecture (IMA) subsystem
> > may verify the IMA signature of the kernel and initramfs, and measure
> > it. The command line parameters passed to the kernel in the kexec call
> > may also be measured by IMA. A remote attestation service can verify
> > a TPM quote based on the TPM event log, the IMA measurement list, and
> > the TPM PCR data. This can be achieved only if the IMA measurement log
> > is carried over from the current kernel to the next kernel across
> > the kexec call.
> >
> > powerpc and ARM64 both achieve this using device tree with a
> > "linux,ima-kexec-buffer" node. x86 platforms generally don't make use of
> > device tree, so use the setup_data mechanism to pass the IMA buffer to
> > the new kernel.
>
> The entire looks good to me, other than a minor concern, please see the
> inline comment.
>
> Reviewed-by: Baoquan He <bhe@redhat.com>
Thanks. Still waiting to see if Eric has any comments before deciding
whether to spin a v5 or not.
> Hi Coiby,
>
> You can check this patch, see if you can take the same way to solve the
> LUKS-encrypted disk issue by passing the key via setup_data.
>
> >
> > Signed-off-by: Jonathan McDowell <noodles@fb.com>
> > ---
> ......snip...
>
> > diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
> > index 170d0fd68b1f..54bd4ce5f908 100644
> > --- a/arch/x86/kernel/kexec-bzimage64.c
> > +++ b/arch/x86/kernel/kexec-bzimage64.c
> > @@ -186,6 +186,33 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr,
> > }
> > #endif /* CONFIG_EFI */
> >
> > +static void
> > +setup_ima_state(const struct kimage *image, struct boot_params *params,
> > + unsigned long params_load_addr,
> > + unsigned int ima_setup_data_offset)
> > +{
> > +#ifdef CONFIG_IMA_KEXEC
> > + struct setup_data *sd = (void *)params + ima_setup_data_offset;
> > + unsigned long setup_data_phys;
> > + struct ima_setup_data *ima;
> > +
> > + if (!image->ima_buffer_size)
> > + return;
> > +
> > + sd->type = SETUP_IMA;
> > + sd->len = sizeof(*ima);
> > +
> > + ima = (void *)sd + sizeof(struct setup_data);
> > + ima->addr = image->ima_buffer_addr;
> > + ima->size = image->ima_buffer_size;
> > +
> > + /* Add setup data */
> > + setup_data_phys = params_load_addr + ima_setup_data_offset;
> > + sd->next = params->hdr.setup_data;
> > + params->hdr.setup_data = setup_data_phys;
> > +#endif /* CONFIG_IMA_KEXEC */
> > +}
> > +
> > static int
> > setup_boot_parameters(struct kimage *image, struct boot_params *params,
> > unsigned long params_load_addr,
> > @@ -247,6 +274,13 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,
> > setup_efi_state(params, params_load_addr, efi_map_offset, efi_map_sz,
> > efi_setup_data_offset);
> > #endif
> > +
> > + /* Setup IMA log buffer state */
> > + setup_ima_state(image, params, params_load_addr,
> > + efi_setup_data_offset +
> > + sizeof(struct setup_data) +
> > + sizeof(struct efi_setup_data));
>
> Is it a little better to update efi_setup_data_offset beforehand, or
> define a local variable?
>
> efi_setup_data_offset += sizeof(struct setup_data) + sizeof(struct efi_setup_data));
> setup_ima_state(image, params, params_load_addr,
> efi_setup_data_offset));
>
> No strong opinion. If nobody has concern about it.
>
> > +
> > /* Setup EDD info */
> > memcpy(params->eddbuf, boot_params.eddbuf,
> > EDDMAXNR * sizeof(struct edd_info));
>
next prev parent reply other threads:[~2022-06-10 9:52 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-22 13:50 [PATCH] Carry forward IMA measurement log on kexec on x86_64 Jonathan McDowell
2022-04-25 16:29 ` Mimi Zohar
2022-04-26 12:08 ` Jonathan McDowell
2022-04-26 13:49 ` Mimi Zohar
2022-04-26 16:48 ` Jonathan McDowell
2022-04-26 18:10 ` Mimi Zohar
2022-04-28 10:40 ` Jonathan McDowell
2022-04-28 12:25 ` Mimi Zohar
2022-04-26 16:52 ` [PATCH v2] " Jonathan McDowell
2022-04-29 21:30 ` Mimi Zohar
2022-05-03 12:02 ` Jonathan McDowell
2022-05-04 13:49 ` Mimi Zohar
2022-05-09 10:40 ` Jonathan McDowell
2022-05-09 11:25 ` Boris Petkov
2022-05-09 17:46 ` Jonathan McDowell
2022-05-09 18:09 ` Borislav Petkov
2022-05-09 18:41 ` Jonathan McDowell
2022-05-09 19:40 ` Borislav Petkov
2022-05-10 8:02 ` Jonathan McDowell
2022-05-10 10:46 ` Borislav Petkov
2022-05-11 9:59 ` [PATCH v3] x86/kexec: Carry forward IMA measurement log on kexec Jonathan McDowell
2022-05-11 17:53 ` Mimi Zohar
2022-05-11 17:56 ` Borislav Petkov
2022-05-11 19:12 ` Mimi Zohar
2022-05-12 1:34 ` Mimi Zohar
2022-05-12 16:25 ` [PATCH v4] " Jonathan McDowell
2022-05-13 17:19 ` Lakshmi Ramasubramanian
2022-05-16 15:15 ` Jonathan McDowell
2022-05-17 17:19 ` Lakshmi Ramasubramanian
2022-05-18 10:42 ` Jonathan McDowell
2022-05-18 14:43 ` Mimi Zohar
2022-05-30 8:40 ` Jonathan McDowell
2022-06-03 15:55 ` Dave Hansen
2022-06-06 3:54 ` Baoquan He
2022-06-06 4:06 ` Baoquan He
2022-06-10 9:52 ` Jonathan McDowell [this message]
2022-06-13 10:30 ` [PATCH v5] " Jonathan McDowell
2022-06-13 21:01 ` Mimi Zohar
2022-06-16 2:59 ` Baoquan He
2022-06-16 15:30 ` [PATCH v6] " Jonathan McDowell
2022-06-30 8:36 ` [PATCH v7] " Jonathan McDowell
2022-06-30 11:54 ` Mimi Zohar
2022-07-04 2:36 ` Baoquan He
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=YqMUPISvPs3ce1oi@noodles-fedora.dhcp.thefacebook.com \
--to=noodles@fb.com \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=coxu@redhat.com \
--cc=dave.hansen@linux.intel.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=hpa@zytor.com \
--cc=jmorris@namei.org \
--cc=kexec@lists.infradead.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=serge@hallyn.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=zohar@linux.ibm.com \
/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).