Skip to contentSkip to conversation

migration: Silence compiler warning in global_state_store_running()

PATCH In review Thomas Huth 3 participants 5 messages Sep 17, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 migration: Silence compiler warning in global_state_store_running()

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.

---
v2: Use strpadcpy instead of QEMU_NONSTRING (and yes, this time it seems
to really silence the compiler warning :-))

 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +2 -2
index 25311479a4..a33947ca32 100644
@@ -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)
Signature · 1 line
2.18.2
#1 lore raw
Quoted 29 lines · Thomas Huth

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.

---
v2: Use strpadcpy instead of QEMU_NONSTRING (and yes, this time it seems
to really silence the compiler warning :-))

 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
migration/global_state.c +0 -0
index 25311479a4..a33947ca32 100644

migration/global_state.c void global_state_store_running(void) · line 48

Quoted 7 lines
migration/global_state.c +2 -2
@@ -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');

https://www.mail-archive.com/[email protected]/msg44925.html
;)

Quoted 4 lines
migration/global_state.c +0 -0
 }
 
 bool global_state_received(void)
#2 lore raw
Quoted 25 lines · Philippe Mathieu-Daudé
Quoted 24 lines · Thomas Huth

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.

---
v2: Use strpadcpy instead of QEMU_NONSTRING (and yes, this time it seems
to really silence the compiler warning :-))

 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 15 lines

migration/global_state.c void global_state_store_running(void) · line 48

Quoted 12 lines
migration/global_state.c +2 -2
index 25311479a4..a33947ca32 100644
@@ -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');

https://www.mail-archive.com/[email protected]/msg44925.html
;)

Oh, well :-) ... but why did you never pushed to get that merged?

Thomas

#3 lore raw
Quoted 42 lines · Thomas Huth
Quoted 25 lines · Philippe Mathieu-Daudé
Quoted 24 lines · Thomas Huth

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.

---
v2: Use strpadcpy instead of QEMU_NONSTRING (and yes, this time it seems
to really silence the compiler warning :-))

 migration/global_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 15 lines

migration/global_state.c void global_state_store_running(void) · line 48

Quoted 12 lines
migration/global_state.c +2 -2
index 25311479a4..a33947ca32 100644
@@ -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');

https://www.mail-archive.com/[email protected]/msg44925.html
;)

Quoted 1 line

Oh, well :-) ... but why did you never pushed to get that merged?

Hmm, commit 0a5526a18b0245dfa20a9fe453b2a9af3125d175 was supposed to fix it already ... but apparently, that does not work with GCC 9.3 ?

Thomas

#4 lore raw
In reply to Thomas Huth
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]