This patch fixes below warning drivers/firmware/efi/tpm.c:78:38: warning: passing argument 1 of ‘tpm2_calc_event_log_size’ makes pointer from integer without a cast [-Wint-conversion] Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com> --- drivers/firmware/efi/tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c index 74d0cd1..1d3f5ca 100644 --- a/drivers/firmware/efi/tpm.c +++ b/drivers/firmware/efi/tpm.c @@ -75,7 +75,7 @@ int __init efi_tpm_eventlog_init(void) goto out; } - tbl_size = tpm2_calc_event_log_size(efi.tpm_final_log + tbl_size = tpm2_calc_event_log_size((void *)efi.tpm_final_log + sizeof(final_tbl->version) + sizeof(final_tbl->nr_events), final_tbl->nr_events, -- 2.7.4
(+ Jarkko, tpmdd, Matthew) On Sat, 15 Jun 2019 at 06:02, Hariprasad Kelam <hariprasad.kelam@gmail.com> wrote: > > This patch fixes below warning > > drivers/firmware/efi/tpm.c:78:38: warning: passing argument 1 of > ‘tpm2_calc_event_log_size’ makes pointer from integer without a cast > [-Wint-conversion] > > Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com> I think we already have a fix queued for this, no? > --- > drivers/firmware/efi/tpm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c > index 74d0cd1..1d3f5ca 100644 > --- a/drivers/firmware/efi/tpm.c > +++ b/drivers/firmware/efi/tpm.c > @@ -75,7 +75,7 @@ int __init efi_tpm_eventlog_init(void) > goto out; > } > > - tbl_size = tpm2_calc_event_log_size(efi.tpm_final_log > + tbl_size = tpm2_calc_event_log_size((void *)efi.tpm_final_log > + sizeof(final_tbl->version) > + sizeof(final_tbl->nr_events), > final_tbl->nr_events, > -- > 2.7.4 >
On Wed, Jun 19, 2019 at 2:55 AM Ard Biesheuvel
<ard.biesheuvel@linaro.org> wrote:
>
> (+ Jarkko, tpmdd, Matthew)
>
> On Sat, 15 Jun 2019 at 06:02, Hariprasad Kelam
> <hariprasad.kelam@gmail.com> wrote:
> >
> > This patch fixes below warning
> >
> > drivers/firmware/efi/tpm.c:78:38: warning: passing argument 1 of
> > ‘tpm2_calc_event_log_size’ makes pointer from integer without a cast
> > [-Wint-conversion]
> >
> > Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
>
> I think we already have a fix queued for this, no?
It looks like I fixed this in "Don't duplicate events from the final
event log in the TCG2 log" rather than a separate patch - I'm fine
merging this, based on Jarkko's preferences.
On Wed, Jun 19, 2019 at 03:48:23PM -0700, Matthew Garrett wrote:
> On Wed, Jun 19, 2019 at 2:55 AM Ard Biesheuvel
> <ard.biesheuvel@linaro.org> wrote:
> >
> > (+ Jarkko, tpmdd, Matthew)
> >
> > On Sat, 15 Jun 2019 at 06:02, Hariprasad Kelam
> > <hariprasad.kelam@gmail.com> wrote:
> > >
> > > This patch fixes below warning
> > >
> > > drivers/firmware/efi/tpm.c:78:38: warning: passing argument 1 of
> > > ‘tpm2_calc_event_log_size’ makes pointer from integer without a cast
> > > [-Wint-conversion]
> > >
> > > Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
> >
> > I think we already have a fix queued for this, no?
>
> It looks like I fixed this in "Don't duplicate events from the final
> event log in the TCG2 log" rather than a separate patch - I'm fine
> merging this, based on Jarkko's preferences.
Right! OK, I squashed just the fix to the earlier patch. Master and
next are updated. Can you take a peek of [1] and see if it looks
legit given all the fuzz around these changes? Then I'm confident
enough to do the 5.3 PR.
[1] git://git.infradead.org/users/jjs/linux-tpmdd.git
/Jarkko
On Thu, Jun 20, 2019 at 2:37 PM Jarkko Sakkinen
<jarkko.sakkinen@linux.intel.com> wrote:
> Right! OK, I squashed just the fix to the earlier patch. Master and
> next are updated. Can you take a peek of [1] and see if it looks
> legit given all the fuzz around these changes? Then I'm confident
> enough to do the 5.3 PR.
All looks good to me. Thanks!
On Thu, 2019-06-20 at 15:00 -0700, Matthew Garrett wrote:
> On Thu, Jun 20, 2019 at 2:37 PM Jarkko Sakkinen
> <jarkko.sakkinen@linux.intel.com> wrote:
> > Right! OK, I squashed just the fix to the earlier patch. Master and
> > next are updated. Can you take a peek of [1] and see if it looks
> > legit given all the fuzz around these changes? Then I'm confident
> > enough to do the 5.3 PR.
>
> All looks good to me. Thanks!
Thank you! I'll send the PR now.
/Jarkko