qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>
Subject: [PATCH v1 04/15] migration: Silence compiler warning in global_state_store_running()
Date: Fri, 25 Sep 2020 16:40:16 +0100	[thread overview]
Message-ID: <20200925154027.12672-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200925154027.12672-1-alex.bennee@linaro.org>

From: Thomas Huth <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)
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200918103430.297167-4-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 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 25311479a4bd..a33947ca32b5 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.20.1



  parent reply	other threads:[~2020-09-25 15:51 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-25 15:40 [PATCH v1 00/15] testing/next pre-PR (python3.6, check-tcg) Alex Bennée
2020-09-25 15:40 ` [PATCH v1 01/15] tests/tcg: reinstate or replace desired parts of rules.mak Alex Bennée
2020-09-25 15:40 ` [PATCH v1 02/15] meson: move libudev test Alex Bennée
2020-09-25 15:40 ` [PATCH v1 03/15] meson: move libmpathpersist test Alex Bennée
2020-09-25 15:57   ` Paolo Bonzini
2020-09-25 19:33     ` Alex Bennée
2020-09-30 10:51     ` Alex Bennée
2020-09-30 10:54       ` Thomas Huth
2020-09-30 11:18         ` Alex Bennée
2020-09-30 13:15         ` Paolo Bonzini
2020-10-01  9:25           ` Alex Bennée
2020-09-25 15:40 ` Alex Bennée [this message]
2020-09-25 15:40 ` [PATCH v1 05/15] travis.yml: Drop the default softmmu builds Alex Bennée
2020-09-25 15:40 ` [PATCH v1 06/15] travis.yml: Update Travis to use Bionic and Focal instead of Xenial Alex Bennée
2020-09-25 15:40 ` [PATCH v1 07/15] travis.yml: Drop the superfluous Python 3.6 build Alex Bennée
2020-09-25 15:40 ` [PATCH v1 08/15] travis.yml: Drop the Python 3.5 build Alex Bennée
2020-09-25 15:40 ` [PATCH v1 09/15] tests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI Alex Bennée
2020-09-25 15:40 ` [PATCH v1 10/15] gitlab-ci: Remove the Debian9-based containers and containers-layer3 Alex Bennée
2020-09-25 15:40 ` [PATCH v1 11/15] tests/docker: Update the tricore container to debian 10 Alex Bennée
2020-09-25 15:40 ` [PATCH v1 12/15] shippable.yml: Remove the Debian9-based MinGW cross-compiler tests Alex Bennée
2020-09-25 15:40 ` [PATCH v1 13/15] tests/docker: Remove old Debian 9 containers Alex Bennée
2020-09-25 15:40 ` [PATCH v1 14/15] gitlab-ci: Increase the timeout for the cross-compiler builds Alex Bennée
2020-09-25 15:40 ` [PATCH v1 15/15] configure: Bump the minimum required Python version to 3.6 Alex Bennée

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=20200925154027.12672-5-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=dgilbert@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=thuth@redhat.com \
    /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).