[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/20] hd-geo-test: Clean up use of buf[] in create_qcow2_with_mbr
From: |
John Snow |
Subject: |
[PULL 12/20] hd-geo-test: Clean up use of buf[] in create_qcow2_with_mbr() |
Date: |
Tue, 17 Mar 2020 19:23:21 -0400 |
From: Markus Armbruster <address@hidden>
valgrind reports write unitialized bytes from buf[]. Clear them.
ASan reports we store to misaligned address in buf[]. Use stl_le_p()
for that.
Cc: Sam Eiderman <address@hidden>
Cc: John Snow <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>
---
tests/qtest/hd-geo-test.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index a249800544..48e8e02d6e 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -421,7 +421,7 @@ static char *create_qcow2_with_mbr(MBRpartitions mbr,
uint64_t sectors)
char *raw_path = strdup(template);
char *qcow2_path = strdup(template);
char cmd[100 + 2 * PATH_MAX];
- uint8_t buf[512];
+ uint8_t buf[512] = {};
int i, ret, fd, offset;
uint64_t qcow2_size = sectors * 512;
uint8_t status, parttype, head, sector, cyl;
@@ -457,8 +457,8 @@ static char *create_qcow2_with_mbr(MBRpartitions mbr,
uint64_t sectors)
buf[offset + 0x6] = sector;
buf[offset + 0x7] = cyl;
- (*(uint32_t *)&buf[offset + 0x8]) = cpu_to_le32(mbr[i].start_sect);
- (*(uint32_t *)&buf[offset + 0xc]) = cpu_to_le32(mbr[i].nr_sects);
+ stl_le_p(&buf[offset + 0x8], mbr[i].start_sect);
+ stl_le_p(&buf[offset + 0xc], mbr[i].nr_sects);
offset += 0x10;
}
--
2.21.1
- [PULL 02/20] cmd646: register vmstate_ide_pci VMStateDescription in DeviceClass, (continued)
- [PULL 02/20] cmd646: register vmstate_ide_pci VMStateDescription in DeviceClass, John Snow, 2020/03/17
- [PULL 03/20] dp264: use pci_create_simple() to initialise the cmd646 device, John Snow, 2020/03/17
- [PULL 04/20] cmd646: remove unused pci_cmd646_ide_init() function, John Snow, 2020/03/17
- [PULL 05/20] via-ide: move registration of VMStateDescription to DeviceClass, John Snow, 2020/03/17
- [PULL 06/20] ide/via: Get rid of via_ide_init(), John Snow, 2020/03/17
- [PULL 07/20] pci: Honour wmask when resetting PCI_INTERRUPT_LINE, John Snow, 2020/03/17
- [PULL 08/20] via-ide: ensure that PCI_INTERRUPT_LINE is hard-wired to its default value, John Snow, 2020/03/17
- [PULL 09/20] via-ide: initialise IDE controller in legacy mode, John Snow, 2020/03/17
- [PULL 10/20] via-ide: allow guests to write to PCI_CLASS_PROG, John Snow, 2020/03/17
- [PULL 11/20] via-ide: always use legacy IRQ 14/15 routing, John Snow, 2020/03/17
- [PULL 12/20] hd-geo-test: Clean up use of buf[] in create_qcow2_with_mbr(),
John Snow <=
- [PULL 13/20] hw/ide: Get rid of piix3_init functions, John Snow, 2020/03/17
- [PULL 14/20] hw/isa/piix4.c: Introduce variable to store devfn, John Snow, 2020/03/17
- [PULL 15/20] hw/ide: Get rid of piix4_init function, John Snow, 2020/03/17
- [PULL 16/20] hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h, John Snow, 2020/03/17
- [PULL 17/20] hw/ide/pci.c: Coding style update to fix checkpatch errors, John Snow, 2020/03/17
- [PULL 18/20] hw/ide: Do ide_drive_get() within pci_ide_create_devs(), John Snow, 2020/03/17
- [PULL 19/20] hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h, John Snow, 2020/03/17
- [PULL 20/20] hw/ide: Remove unneeded inclusion of hw/ide.h, John Snow, 2020/03/17
- Re: [PULL 00/20] Ide patches, Peter Maydell, 2020/03/19