[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/17] dump: fill in the flat header signature more p
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 01/17] dump: fill in the flat header signature more pleasingly to the eye |
Date: |
Wed, 11 Jun 2014 10:50:46 -0400 |
From: Laszlo Ersek <address@hidden>
The "mh.signature" array field has size 16, and is zeroed by the preceding
memset(). MAKEDUMPFILE_SIGNATURE expands to a string literal with string
length 12 (size 13). There's no need to measure the length of
MAKEDUMPFILE_SIGNATURE at runtime, nor for the extra zero-filling of
"mh.signature" with strncpy().
Use memcpy() with MIN(sizeof, sizeof) for robustness (which is an integer
constant expression, evaluable at compile time.)
Approximately-suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
dump.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dump.c b/dump.c
index e56b7cf..ac4505e 100644
--- a/dump.c
+++ b/dump.c
@@ -716,8 +716,8 @@ static int write_start_flat_header(int fd)
int ret = 0;
memset(&mh, 0, sizeof(mh));
- strncpy(mh.signature, MAKEDUMPFILE_SIGNATURE,
- strlen(MAKEDUMPFILE_SIGNATURE));
+ memcpy(mh.signature, MAKEDUMPFILE_SIGNATURE,
+ MIN(sizeof mh.signature, sizeof MAKEDUMPFILE_SIGNATURE));
mh.type = cpu_to_be64(TYPE_FLAT_HEADER);
mh.version = cpu_to_be64(VERSION_FLAT_HEADER);
--
1.9.3
- [Qemu-devel] [PULL 00/17] QMP queue, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 07/17] dump: simplify get_len_buf_out(), Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 09/17] monitor: Add watchdog_action argument completion, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 13/17] readline: Make completion strings always unique, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 01/17] dump: fill in the flat header signature more pleasingly to the eye,
Luiz Capitulino <=
- [Qemu-devel] [PULL 08/17] monitor: Add ringbuf_write and ringbuf_read argument completion, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 02/17] dump: simplify write_start_flat_header(), Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 06/17] dump: hoist lzo_init() from get_len_buf_out() to dump_init(), Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 11/17] net: Export valid host network devices list, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 12/17] monitor: Add host_net_add device argument completion, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 05/17] dump: select header bitness based on ELF class, not ELF architecture, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 04/17] dump: eliminate DumpState.page_size ("guest's page size"), Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 10/17] monitor: Add migrate_set_capability completion, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 03/17] dump: eliminate DumpState.page_shift ("guest's page shift"), Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 16/17] readline: Clear screen on form feed., Luiz Capitulino, 2014/06/11