The original code used sizeof(info->signature) as the size parameter for
memcpy, which was wrong.
Fix that by using structure assignment.
Signed-off-by: Wei Liu <wei.l...@citrix.com>
---
tools/firmware/hvmloader/ovmf.c | 8 ++++----
tools/firmware/hvmloader/seabios.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c
index b4bcc93..0ac3416 100644
--- a/tools/firmware/hvmloader/ovmf.c
+++ b/tools/firmware/hvmloader/ovmf.c
@@ -68,10 +68,10 @@ static void ovmf_setup_bios_info(void)
{
struct ovmf_info *info = (void *)OVMF_INFO_PHYSICAL_ADDRESS;
- memset(info, 0, sizeof(*info));
-
- memcpy(info->signature, "XenHVMOVMF", sizeof(info->signature));
- info->length = sizeof(*info);
+ *info = (struct ovmf_info) {
+ .signature = "XenHVMOVMF",
+ .length = sizeof(*info)
+ };
}
static void ovmf_finish_bios_info(void)
diff --git a/tools/firmware/hvmloader/seabios.c
b/tools/firmware/hvmloader/seabios.c
index 5c9a351..44ff0d7 100644
--- a/tools/firmware/hvmloader/seabios.c
+++ b/tools/firmware/hvmloader/seabios.c
@@ -56,10 +56,10 @@ static void seabios_setup_bios_info(void)
{
struct seabios_info *info = (void *)BIOS_INFO_PHYSICAL_ADDRESS;
- memset(info, 0, sizeof(*info));
-
- memcpy(info->signature, "XenHVMSeaBIOS", sizeof(info->signature));
- info->length = sizeof(*info);
+ *info = (struct seabios_info) {
+ .signature = "XenHVMSeaBIOS",
+ .length = sizeof(*info)
+ };
info->tables = (uint32_t)scratch_alloc(MAX_TABLES*sizeof(uint32_t), 0);
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
