qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Markus Armbruster <armbru@redhat.com>
Subject: [PATCH 3/6] migration: Silence compiler warning in global_state_store_running()
Date: Fri, 18 Sep 2020 12:34:27 +0200	[thread overview]
Message-ID: <20200918103430.297167-4-thuth@redhat.com> (raw)
In-Reply-To: <20200918103430.297167-1-thuth@redhat.com>

GCC 9.3.0 on Ubuntu complains:

In file included from /usr/include/string.h:495,
                 from /home/travis/build/huth/qemu/include/qemu/osdep.h:87,
                 from ../migration/global_state.c:13:
In function ‘strncpy’,
    inlined from ‘global_state_store_running’ at ../migration/global_state.c:47:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error:
 ‘__builtin_strncpy’ specified bound 100 equals destination size [-Werror=stringop-truncation]
  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... but we apparently really want to do a strncpy here - the size is already
checked with the assert() statement right in front of it. To silence the
warning, simply replace it with our strpadcpy() function.

Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com> (two years ago)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/migration/global_state.c b/migration/global_state.c
index 25311479a4..a33947ca32 100644
--- a/migration/global_state.c
+++ b/migration/global_state.c
@@ -44,8 +44,8 @@ void global_state_store_running(void)
 {
     const char *state = RunState_str(RUN_STATE_RUNNING);
     assert(strlen(state) < sizeof(global_state.runstate));
-    strncpy((char *)global_state.runstate,
-           state, sizeof(global_state.runstate));
+    strpadcpy((char *)global_state.runstate, sizeof(global_state.runstate),
+              state, '\0');
 }
 
 bool global_state_received(void)
-- 
2.18.2



  parent reply	other threads:[~2020-09-18 10:38 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-18 10:34 [PATCH 0/6] Update Travis from Xenial to Bionic and Focal Thomas Huth
2020-09-18 10:34 ` [PATCH 1/6] meson: move libudev test Thomas Huth
2020-09-18 10:34 ` [PATCH 2/6] meson: move libmpathpersist test Thomas Huth
2020-09-18 10:34 ` Thomas Huth [this message]
2020-09-21 20:39   ` [PATCH 3/6] migration: Silence compiler warning in global_state_store_running() Cleber Rosa
2020-09-22  6:48     ` Thomas Huth
2020-09-18 10:34 ` [PATCH 4/6] travis.yml: Drop the default softmmu builds Thomas Huth
2020-09-21 20:40   ` Cleber Rosa
2020-09-18 10:34 ` [PATCH 5/6] travis.yml: Update Travis to use Bionic and Focal instead of Xenial Thomas Huth
2020-09-21 23:39   ` Cleber Rosa
2020-09-22  6:55     ` Thomas Huth
2020-09-18 10:34 ` [PATCH 6/6] travis.yml: Drop the superfluous Python 3.6 build Thomas Huth
2020-09-21 23:40   ` Cleber Rosa
2020-09-18 12:51 ` [PATCH 0/6] Update Travis from Xenial to Bionic and Focal Paolo Bonzini
2020-09-18 12:54   ` Thomas Huth
2020-09-21 18:46 ` Alex Bennée
2020-09-22  7:04 ` [PATCH 7/6] travis.yml: Drop the Python 3.5 build Thomas Huth

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=20200918103430.297167-4-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=armbru@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@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).