[PULL,01/17] dump: fill in the flat header signature more pleasingly to the eye
diff mbox

Message ID 1402498262-20521-2-git-send-email-lcapitulino@redhat.com
State New
Headers show

Commit Message

Luiz Capitulino June 11, 2014, 2:50 p.m. UTC
From: Laszlo Ersek <lersek@redhat.com>

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 <pbonzini@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
 dump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox

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);