[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Thu, 4 Apr 2019 19:54:20 +0700
From: Ard Biesheuvel <ard.biesheuvel@...aro.org>
To: Matthew Garrett <matthewgarrett@...gle.com>
Cc: linux-integrity <linux-integrity@...r.kernel.org>,
Peter Hüwe <peterhuewe@....de>,
Jarkko Sakkinen <jarkko.sakkinen@...ux.intel.com>,
jgg@...pe.ca, Roberto Sassu <roberto.sassu@...wei.com>,
linux-efi <linux-efi@...r.kernel.org>,
linux-security-module <linux-security-module@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Thiebaud Weksteen <tweek@...gle.com>,
Matthew Garrett <mjg59@...gle.com>
Subject: Re: [PATCH 1/2] efi: Fix cast to pointer from integer of different
size in TPM log code
On Wed, 3 Apr 2019 at 04:56, Matthew Garrett <matthewgarrett@...gle.com> wrote:
>
> 8bfcff4a6a1d9d7226bb63a7da758b82d9ab4373
Which tree is this commit in?
> introduced a cast from
> efi_physical_address_t to (void *), which are different sizes on 32-bit.
> Fix that. Caught by the 0-day test bot.
>
> Signed-off-by: Matthew Garrett <mjg59@...gle.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@...aro.org>
I'll pick this up as a fix if we can clean up the commit log so it
doesn't refer to a commit that does not exist in mainline.
> ---
> drivers/firmware/efi/libstub/tpm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/firmware/efi/libstub/tpm.c b/drivers/firmware/efi/libstub/tpm.c
> index b6e93e14fcf1..6b3b507a54eb 100644
> --- a/drivers/firmware/efi/libstub/tpm.c
> +++ b/drivers/firmware/efi/libstub/tpm.c
> @@ -114,8 +114,8 @@ void efi_retrieve_tpm2_eventlog(efi_system_table_t *sys_table_arg)
> */
> last_entry_size =
> __calc_tpm2_event_size((void *)last_entry_addr,
> - (void *)log_location,
> - false);
> + (void *)(long)log_location,
> + false);
> } else {
> last_entry_size = sizeof(struct tcpa_event) +
> ((struct tcpa_event *) last_entry_addr)->event_size;
> --
> 2.21.0.392.gf8f6787159e-goog
>
Powered by blists - more mailing lists