Re: [PATCH v2] tpm: use kmemdup() to copy the event log

[Jarkko Sakkinen]

On Tue, 2018-02-20 at 15:26 +0100, Javier Martinez Canillas wrote:
> On 02/20/2018 12:41 PM, Jarkko Sakkinen wrote:
> > Replaced kmalloc() + memcpy() in tpm_eventlog_efi.c and
> > tpm_eventlog_of.c.
> > 
> > Signed-off-by: Jarkko Sakkinen 
> > ---
> 
> Looks good to me.
> 
> Reviewed-by: Javier Martinez Canillas 

Thanks!

/Jarkko

Re: [PATCH v2] tpm: use kmemdup() to copy the event log

[Jarkko Sakkinen]

On Tue, 2018-02-20 at 15:26 +0100, Javier Martinez Canillas wrote:
> On 02/20/2018 12:41 PM, Jarkko Sakkinen wrote:
> > Replaced kmalloc() + memcpy() in tpm_eventlog_efi.c and
> > tpm_eventlog_of.c.
> > 
> > Signed-off-by: Jarkko Sakkinen 
> > ---
> 
> Looks good to me.
> 
> Reviewed-by: Javier Martinez Canillas 

Thanks!

/Jarkko

Re: [PATCH v2] tpm: use kmemdup() to copy the event log

[Javier Martinez Canillas]

On 02/20/2018 12:41 PM, Jarkko Sakkinen wrote:
> Replaced kmalloc() + memcpy() in tpm_eventlog_efi.c and
> tpm_eventlog_of.c.
> 
> Signed-off-by: Jarkko Sakkinen 
> ---

Looks good to me.

Reviewed-by: Javier Martinez Canillas 

Best regards,
-- 
Javier Martinez Canillas
Software Engineer - Desktop Hardware Enablement
Red Hat

Re: [PATCH v2] tpm: use kmemdup() to copy the event log

[Javier Martinez Canillas]

On 02/20/2018 12:41 PM, Jarkko Sakkinen wrote:
> Replaced kmalloc() + memcpy() in tpm_eventlog_efi.c and
> tpm_eventlog_of.c.
> 
> Signed-off-by: Jarkko Sakkinen 
> ---

Looks good to me.

Reviewed-by: Javier Martinez Canillas 

Best regards,
-- 
Javier Martinez Canillas
Software Engineer - Desktop Hardware Enablement
Red Hat

[PATCH v2] tpm: use kmemdup() to copy the event log

[Jarkko Sakkinen]

Replaced kmalloc() + memcpy() in tpm_eventlog_efi.c and
tpm_eventlog_of.c.

Signed-off-by: Jarkko Sakkinen 
---
v2: update also tpm_eventlog_of.c
 drivers/char/tpm/tpm_eventlog_efi.c | 3 +--
 drivers/char/tpm/tpm_eventlog_of.c  | 5 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/char/tpm/tpm_eventlog_efi.c 
b/drivers/char/tpm/tpm_eventlog_efi.c
index e3f9ffd341d2..57c8b3cc46be 100644
--- a/drivers/char/tpm/tpm_eventlog_efi.c
+++ b/drivers/char/tpm/tpm_eventlog_efi.c
@@ -50,10 +50,9 @@ int tpm_read_log_efi(struct tpm_chip *chip)
}
 
/* malloc EventLog space */
-   log->bios_event_log = kmalloc(log_size, GFP_KERNEL);
+   log->bios_event_log = kmemdup(log_tbl->log, log_size, GFP_KERNEL);
if (!log->bios_event_log)
goto err_memunmap;
-   memcpy(log->bios_event_log, log_tbl->log, log_size);
log->bios_event_log_end = log->bios_event_log + log_size;
 
tpm_log_version = log_tbl->version;
diff --git a/drivers/char/tpm/tpm_eventlog_of.c 
b/drivers/char/tpm/tpm_eventlog_of.c
index 96fd5646f866..c4b1d3049060 100644
--- a/drivers/char/tpm/tpm_eventlog_of.c
+++ b/drivers/char/tpm/tpm_eventlog_of.c
@@ -68,14 +68,11 @@ int tpm_read_log_of(struct tpm_chip *chip)
return -EIO;
}
 
-   log->bios_event_log = kmalloc(size, GFP_KERNEL);
+   log->bios_event_log = kmemdup(__va(base), size, GFP_KERNEL);
if (!log->bios_event_log)
return -ENOMEM;
-
log->bios_event_log_end = log->bios_event_log + size;
 
-   memcpy(log->bios_event_log, __va(base), size);
-
if (chip->flags & TPM_CHIP_FLAG_TPM2)
return EFI_TCG2_EVENT_LOG_FORMAT_TCG_2;
return EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2;
-- 
2.14.1

[PATCH v2] tpm: use kmemdup() to copy the event log

[Jarkko Sakkinen]

Replaced kmalloc() + memcpy() in tpm_eventlog_efi.c and
tpm_eventlog_of.c.

Signed-off-by: Jarkko Sakkinen 
---
v2: update also tpm_eventlog_of.c
 drivers/char/tpm/tpm_eventlog_efi.c | 3 +--
 drivers/char/tpm/tpm_eventlog_of.c  | 5 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/char/tpm/tpm_eventlog_efi.c 
b/drivers/char/tpm/tpm_eventlog_efi.c
index e3f9ffd341d2..57c8b3cc46be 100644
--- a/drivers/char/tpm/tpm_eventlog_efi.c
+++ b/drivers/char/tpm/tpm_eventlog_efi.c
@@ -50,10 +50,9 @@ int tpm_read_log_efi(struct tpm_chip *chip)
}
 
/* malloc EventLog space */
-   log->bios_event_log = kmalloc(log_size, GFP_KERNEL);
+   log->bios_event_log = kmemdup(log_tbl->log, log_size, GFP_KERNEL);
if (!log->bios_event_log)
goto err_memunmap;
-   memcpy(log->bios_event_log, log_tbl->log, log_size);
log->bios_event_log_end = log->bios_event_log + log_size;
 
tpm_log_version = log_tbl->version;
diff --git a/drivers/char/tpm/tpm_eventlog_of.c 
b/drivers/char/tpm/tpm_eventlog_of.c
index 96fd5646f866..c4b1d3049060 100644
--- a/drivers/char/tpm/tpm_eventlog_of.c
+++ b/drivers/char/tpm/tpm_eventlog_of.c
@@ -68,14 +68,11 @@ int tpm_read_log_of(struct tpm_chip *chip)
return -EIO;
}
 
-   log->bios_event_log = kmalloc(size, GFP_KERNEL);
+   log->bios_event_log = kmemdup(__va(base), size, GFP_KERNEL);
if (!log->bios_event_log)
return -ENOMEM;
-
log->bios_event_log_end = log->bios_event_log + size;
 
-   memcpy(log->bios_event_log, __va(base), size);
-
if (chip->flags & TPM_CHIP_FLAG_TPM2)
return EFI_TCG2_EVENT_LOG_FORMAT_TCG_2;
return EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2;
-- 
2.14.1