qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/2] migration: avoid suspicious strncpy() use


From: Stefan Hajnoczi
Subject: [PATCH 1/2] migration: avoid suspicious strncpy() use
Date: Mon, 16 Mar 2020 16:07:01 +0000

gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1) with sanitizers enabled
reports the following error:

    CC      migration/global_state.o
  In file included from /usr/include/string.h:495,
                   from /home/stefanha/qemu/include/qemu/osdep.h:101,
                   from migration/global_state.c:13:
  In function ‘strncpy’,
      inlined from ‘global_state_store_running’ at 
migration/global_state.c:47:5:
  /usr/include/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));
        |          
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Use pstrcpy() instead of strncpy().  It is guaranteed to NUL-terminate
strings.

Signed-off-by: Stefan Hajnoczi <address@hidden>
---
 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..cbe07f21a8 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));
+    pstrcpy((char *)global_state.runstate,
+            sizeof(global_state.runstate), state);
 }
 
 bool global_state_received(void)
-- 
2.24.1


reply via email to

[Prev in Thread] Current Thread [Next in Thread]