You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.6 KiB
38 lines
1.6 KiB
2 years ago
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lu Ken <ken.lu@intel.com>
|
||
|
|
Date: Wed, 13 Jul 2022 10:06:11 +0800
|
||
|
|
Subject: [PATCH] commands/efi/tpm: Use grub_strcpy() instead of grub_memcpy()
|
||
|
|
|
||
|
|
The event description is a string, so using grub_strcpy() is cleaner than
|
||
|
|
using grub_memcpy().
|
||
|
|
|
||
|
|
Signed-off-by: Lu Ken <ken.lu@intel.com>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
(cherry picked from commit ef8679b645a63eb9eb191bb9539d7d25a9d6ff3b)
|
||
|
|
---
|
||
|
|
grub-core/commands/efi/tpm.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/commands/efi/tpm.c b/grub-core/commands/efi/tpm.c
|
||
|
|
index 7acf510499..bb59599721 100644
|
||
|
|
--- a/grub-core/commands/efi/tpm.c
|
||
|
|
+++ b/grub-core/commands/efi/tpm.c
|
||
|
|
@@ -175,7 +175,7 @@ grub_tpm1_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
|
||
|
|
event->PCRIndex = pcr;
|
||
|
|
event->EventType = EV_IPL;
|
||
|
|
event->EventSize = grub_strlen (description) + 1;
|
||
|
|
- grub_memcpy (event->Event, description, event->EventSize);
|
||
|
|
+ grub_strcpy ((char *) event->Event, description);
|
||
|
|
|
||
|
|
algorithm = TCG_ALG_SHA;
|
||
|
|
status = efi_call_7 (tpm->log_extend_event, tpm, (grub_addr_t) buf, (grub_uint64_t) size,
|
||
|
|
@@ -212,7 +212,7 @@ grub_tpm2_log_event (grub_efi_handle_t tpm_handle, unsigned char *buf,
|
||
|
|
event->Header.EventType = EV_IPL;
|
||
|
|
event->Size =
|
||
|
|
sizeof (*event) - sizeof (event->Event) + grub_strlen (description) + 1;
|
||
|
|
- grub_memcpy (event->Event, description, grub_strlen (description) + 1);
|
||
|
|
+ grub_strcpy ((char *) event->Event, description);
|
||
|
|
|
||
|
|
status = efi_call_5 (tpm->hash_log_extend_event, tpm, 0, (grub_addr_t) buf,
|
||
|
|
(grub_uint64_t) size, event);
|