qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 18/20] dump: Fix build with newer gcc
Date: Fri,  6 Apr 2018 19:11:19 +0200	[thread overview]
Message-ID: <1523034681-33787-19-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1523034681-33787-1-git-send-email-pbonzini@redhat.com>

From: Eric Blake <eblake@redhat.com>

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

diff --git a/dump.c b/dump.c
index 669f715..b54cd42 100644
--- a/dump.c
+++ b/dump.c
@@ -814,7 +814,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);
@@ -926,7 +926,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);
-- 
1.8.3.1

  parent reply	other threads:[~2018-04-06 17:11 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-06 17:11 [Qemu-devel] [PULL 00/20] Miscellaneous patches for QEMU 2.12-rc Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 01/20] sys_membarrier: fix up include directives Paolo Bonzini
2018-04-06 17:44   ` Eric Blake
2018-04-06 17:11 ` [Qemu-devel] [PULL 02/20] target/i386: Fix andn instruction Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 03/20] scripts/checkpatch.pl: Bug fix Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 04/20] memfd: fix vhost-user-test on non-memfd capable host Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 05/20] target/i386: WHPX: set CPUID_EXT_HYPERVISOR bit Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 06/20] i386/hyperv: add hv-frequencies cpu property Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 07/20] i386/hyperv: error out if features requested but unsupported Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 08/20] configure: Add missing configure options to help text Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 09/20] scsi-disk: Don't enlarge min_io_size to max_io_size Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 10/20] scsi-disk: allow customizing the SCSI version Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 11/20] hw/scsi: support SCSI-2 passthrough without PI Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 12/20] hw/dma/i82374: Avoid double creation of the 82374 controller Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 13/20] kvmclock: fix clock_is_reliable on migration from QEMU < 2.9 Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 14/20] virtio-serial: fix heapover-flow Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 15/20] qemu-pr-helper: Daemonize before dropping privileges Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 16/20] qemu-pr-helper: Write pidfile more often Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 17/20] device-crash-test: Remove fixed isa-fdc entry Paolo Bonzini
2018-04-06 17:11 ` Paolo Bonzini [this message]
2018-04-06 17:11 ` [Qemu-devel] [PULL 19/20] maint: Add .mailmap entries for patches claiming list authorship Paolo Bonzini
2018-04-06 17:11 ` [Qemu-devel] [PULL 20/20] Add missing bit for SSE instr in VEX decoding Paolo Bonzini
2018-04-09  9:20 ` [Qemu-devel] [PULL 00/20] Miscellaneous patches for QEMU 2.12-rc Peter Maydell
2018-04-09 10:57   ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1523034681-33787-19-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).