[Xen-changelog] [qemu-xen staging-4.10] dump: Fix build with newer gcc

[patchbot@xxxxxxx]

commit 6ea4cef2bd717045ac0e84b52a5b1b7716feb0c2
Author:     Eric Blake <eblake@xxxxxxxxxx>
AuthorDate: Tue Mar 27 15:21:51 2018 -0500
Commit:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
CommitDate: Fri Jun 29 15:18:40 2018 +0100

    dump: Fix build with newer gcc
    
    gcc 8 on rawhide is picky enough to complain:
    
    /home/dummy/qemu/dump.c: In function 'create_header32':
    /home/dummy/qemu/dump.c:817:5: error: 'strncpy' output truncated before 
terminating nul copying 8 bytes from a string of the same length 
[-Werror=stringop-truncation]
         strncpy(dh->signature, KDUMP_SIGNATURE, strlen(KDUMP_SIGNATURE));
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    But we already have SIG_LEN defined as the right length without needing
    to do a strlen(), and memcpy() is better than strncpy() when we know
    we do not want a trailing NUL byte.
    
    Signed-off-by: Eric Blake <eblake@xxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit 84c868f6b8f8c1be9d3d65df93cf00b30821401c)
---
 dump.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dump.c b/dump.c
index d9090a24cc..5636297da2 100644
--- a/dump.c
+++ b/dump.c
@@ -731,7 +731,7 @@ static void create_header32(DumpState *s, Error **errp)
     size = sizeof(DiskDumpHeader32);
     dh = g_malloc0(size);
 
-    strncpy(dh->signature, KDUMP_SIGNATURE, strlen(KDUMP_SIGNATURE));
+    memcpy(dh->signature, KDUMP_SIGNATURE, SIG_LEN);
     dh->header_version = cpu_to_dump32(s, 6);
     block_size = s->dump_info.page_size;
     dh->block_size = cpu_to_dump32(s, block_size);
@@ -831,7 +831,7 @@ static void create_header64(DumpState *s, Error **errp)
     size = sizeof(DiskDumpHeader64);
     dh = g_malloc0(size);
 
-    strncpy(dh->signature, KDUMP_SIGNATURE, strlen(KDUMP_SIGNATURE));
+    memcpy(dh->signature, KDUMP_SIGNATURE, SIG_LEN);
     dh->header_version = cpu_to_dump32(s, 6);
     block_size = s->dump_info.page_size;
     dh->block_size = cpu_to_dump32(s, block_size);
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.10

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog