Fixing several GCC 11 warnings
v3 cover Fixing several GCC 11 warnings
Compiling qemu using GCC 11 we got several new warnings. To allow build with --enable-werror, we need to solve issues generating these warnings.
v2:
- Patch 2 rewrite to use strpadcpy
- removed Patch 3 (different version sent by Philippe Mathieu-Daudé)
v3:
- Fixed patch commit logs (no cod changes)
Miroslav Rezanina (2):
Fix net.c warning on GCC 11
s390x: Use strpadcpy for copying vm name
net/eth.c | 3 +++ target/s390x/kvm.c | 12 +++++------- target/s390x/misc_helper.c | 7 +++++-- 3 files changed, 13 insertions(+), 9 deletions(-)
Signature · 1 line
2.18.4
PATCH v3 1/2 Fix net.c warning on GCC 11
When building qemu with GCC 11, compiling eth.c file produce following warning:
warning: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Warray-bounds]
This is caused by retyping from ip6_ext_hdr to ip6_ext_hdr_routing that has more attributes.
As this usage is expected, suppress the warning temporarily through the function using this retyping.
--- net/eth.c | 3 +++ 1 file changed, 3 insertions(+)
net/eth.c +3 -0
@@ -405,6 +405,8 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, struct ip6_ext_hdr *ext_hdr, struct in6_address *dst_addr) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds"struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr; if ((rthdr->rtype == 2) &&
@@ -426,6 +428,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, }return false; +#pragma GCC diagnostic pop } static bool
Signature · 1 line
2.18.4
Re: [PATCH v3 1/2] Fix net.c warning on GCC 11
+Jason +Dmitry
Quoted 9 lines · Miroslav Rezanina
When building qemu with GCC 11, compiling
eth.cfile produce following warning:warning: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Warray-bounds]
This is caused by retyping from
ip6_ext_hdrtoip6_ext_hdr_routingthat has more attributes.As this usage is expected, suppress the warning temporarily through the function using this retyping.
This is not expected, this is a bug...
Quoted 11 lines
Signed-off-by Miroslav Rezanina <[email protected]>--- net/eth.c | 3 +++ 1 file changed, 3 insertions(+)net/eth.c +0
-0
net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 410
Quoted 6 lines
net/eth.c +2
-0@@ -405,6 +405,8 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, struct ip6_ext_hdr *ext_hdr, struct in6_address *dst_addr) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds"struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr;
eth_parse_ipv6_hdr() called iov_to_buf() to fill the 2 bytes of ext_hdr.
net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 412
Quoted 1 line
net/eth.c +0
-0if ((rthdr->rtype == 2) &&
Here we access after the 2 bytes filled... rthdr->rtype is somewhere on eth_parse_ipv6_hdr's stack, its content is unknown.
net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 431
Quoted 5 lines
net/eth.c +1
-0@@ -426,6 +428,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, }return false; +#pragma GCC diagnostic pop
Re: [PATCH v3 1/2] Fix net.c warning on GCC 11
Quoted 7 lines · Philippe Mathieu-Daudé
+Jason +Dmitry
Quoted 4 lines · Miroslav Rezanina
When building qemu with GCC 11, compiling
eth.cfile produce following warning:warning: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Warray-bounds]
Quoted 8 lines
Quoted 5 lines
This is caused by retyping from
ip6_ext_hdrtoip6_ext_hdr_routingthat has more attributes.As this usage is expected, suppress the warning temporarily through the function using this retyping.
This is not expected, this is a bug...
Seems related: https://bugs.launchpad.net/qemu/+bug/1879531
-Alex
Quoted 34 lines
Quoted 11 lines
Signed-off-by Miroslav Rezanina <[email protected]>--- net/eth.c | 3 +++ 1 file changed, 3 insertions(+)net/eth.c +0
-0net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 410
Quoted 6 lines
net/eth.c +2
-0@@ -405,6 +405,8 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, struct ip6_ext_hdr *ext_hdr, struct in6_address *dst_addr) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds"struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr;
eth_parse_ipv6_hdr()callediov_to_buf()to fill the 2 bytes ofext_hdr.net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 412
Quoted 1 line
net/eth.c +0
-0if ((rthdr->rtype == 2) &&Here we access after the 2 bytes filled...
rthdr->rtypeis somewhere on eth_parse_ipv6_hdr's stack, its content is unknown.net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 431
Quoted 5 lines
net/eth.c +1
-0@@ -426,6 +428,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, }return false; +#pragma GCC diagnostic pop
Re: [PATCH v3 1/2] Fix net.c warning on GCC 11
Quoted 11 lines · Alexander Bulekov
Quoted 10 lines · Philippe Mathieu-Daudé
+Jason +Dmitry
Quoted 7 lines · Miroslav Rezanina
When building qemu with GCC 11, compiling
eth.cfile produce following warning:warning: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Warray-bounds]
This is caused by retyping from
ip6_ext_hdrtoip6_ext_hdr_routingthat has more attributes.
Quoted 9 lines
Quoted 5 lines
Quoted 2 lines
As this usage is expected, suppress the warning temporarily through the function using this retyping.
This is not expected, this is a bug...
Seems related: https://bugs.launchpad.net/qemu/+bug/1879531
-Alex
Yes, it is caused by the issue triggering the warning. Do you know whether the patch mentioned in bug was already sent?
Mirek
Quoted 35 lines
Quoted 34 lines
Quoted 11 lines
Signed-off-by Miroslav Rezanina <[email protected]>--- net/eth.c | 3 +++ 1 file changed, 3 insertions(+)net/eth.c +0
-0net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 410
Quoted 6 lines
net/eth.c +2
-0@@ -405,6 +405,8 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, struct ip6_ext_hdr *ext_hdr, struct in6_address *dst_addr) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds"struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr;
eth_parse_ipv6_hdr()callediov_to_buf()to fill the 2 bytes ofext_hdr.net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 412
Quoted 1 line
net/eth.c +0
-0if ((rthdr->rtype == 2) &&Here we access after the 2 bytes filled...
rthdr->rtypeis somewhere on eth_parse_ipv6_hdr's stack, its content is unknown.net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 431
Quoted 5 lines
net/eth.c +1
-0@@ -426,6 +428,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, }return false; +#pragma GCC diagnostic pop
Re: [PATCH v3 1/2] Fix net.c warning on GCC 11
Quoted 18 lines · Miroslav Rezanina
Quoted 17 lines · Alexander Bulekov
Quoted 15 lines · Philippe Mathieu-Daudé
+Jason +Dmitry
Quoted 9 lines · Miroslav Rezanina
When building qemu with GCC 11, compiling
eth.cfile produce following warning:warning: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Warray-bounds]
This is caused by retyping from
ip6_ext_hdrtoip6_ext_hdr_routingthat has more attributes.As this usage is expected, suppress the warning temporarily through the function using this retyping.
This is not expected, this is a bug...
Quoted 8 lines
Quoted 3 lines
Seems related: https://bugs.launchpad.net/qemu/+bug/1879531
-AlexYes, it is caused by the issue triggering the warning. Do you know whether the patch mentioned in bug was already sent?
Mirek
I don't think so..
-Alex
Quoted 36 lines
Quoted 35 lines
Quoted 34 lines
Quoted 11 lines
Signed-off-by Miroslav Rezanina <[email protected]>--- net/eth.c | 3 +++ 1 file changed, 3 insertions(+)net/eth.c +0
-0net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 410
Quoted 6 lines
net/eth.c +2
-0@@ -405,6 +405,8 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, struct ip6_ext_hdr *ext_hdr, struct in6_address *dst_addr) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds"struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr;
eth_parse_ipv6_hdr()callediov_to_buf()to fill the 2 bytes ofext_hdr.net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 412
Quoted 1 line
net/eth.c +0
-0if ((rthdr->rtype == 2) &&Here we access after the 2 bytes filled...
rthdr->rtypeis somewhere on eth_parse_ipv6_hdr's stack, its content is unknown.net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 431
Quoted 5 lines
net/eth.c +1
-0@@ -426,6 +428,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, }return false; +#pragma GCC diagnostic pop
Re: [PATCH v3 1/2] Fix net.c warning on GCC 11
Quoted 23 lines · Alexander Bulekov
Quoted 22 lines · Miroslav Rezanina
Quoted 20 lines · Alexander Bulekov
Quoted 7 lines · Philippe Mathieu-Daudé
+Jason +Dmitry
Quoted 4 lines · Miroslav Rezanina
When building qemu with GCC 11, compiling
eth.cfile produce following warning:warning: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Warray-bounds]
Quoted 8 lines
Quoted 5 lines
This is caused by retyping from
ip6_ext_hdrtoip6_ext_hdr_routingthat has more attributes.As this usage is expected, suppress the warning temporarily through the function using this retyping.
This is not expected, this is a bug...
Seems related: https://bugs.launchpad.net/qemu/+bug/1879531
-Alex
Quoted 6 lines
Quoted 4 lines
Yes, it is caused by the issue triggering the warning. Do you know whether the patch mentioned in bug was already sent?
Mirek
I don't think so..
Just sent one:
https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg03205.html
Re: [PATCH v3 1/2] Fix net.c warning on GCC 11
In reply to Alexander BulekovQuoted 11 lines · Alexander Bulekov
Quoted 10 lines · Philippe Mathieu-Daudé
+Jason +Dmitry
Quoted 7 lines · Miroslav Rezanina
When building qemu with GCC 11, compiling
eth.cfile produce following warning:warning: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Warray-bounds]
This is caused by retyping from
ip6_ext_hdrtoip6_ext_hdr_routingthat has more attributes.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
As this usage is expected, suppress the warning temporarily through the function using this retyping.
This is not expected, this is a bug...
Seems related: https://bugs.launchpad.net/qemu/+bug/1879531
Yes!
Re: [PATCH v3 1/2] Fix net.c warning on GCC 11
In reply to Philippe Mathieu-DaudéQuoted 7 lines · Philippe Mathieu-Daudé
+Jason +Dmitry
Quoted 4 lines · Miroslav Rezanina
When building qemu with GCC 11, compiling
eth.cfile produce following warning:warning: array subscript 'struct ip6_ext_hdr_routing[0]' is partly outside array bounds of 'struct ip6_ext_hdr[1]' [-Warray-bounds]
Quoted 7 lines
Quoted 5 lines
This is caused by retyping from
ip6_ext_hdrtoip6_ext_hdr_routingthat has more attributes.As this usage is expected, suppress the warning temporarily through the function using this retyping.
This is not expected, this is a bug...
Thanks for confirmation, my initial idea was the same but then I got impression (do not remember where) that ip6_ext_hdr is not type where data are initially written to so the overflow here is expected.
Mirek
Quoted 35 lines
Quoted 12 lines
Signed-off-by Miroslav Rezanina <[email protected]>--- net/eth.c | 3 +++ 1 file changed, 3 insertions(+)net/eth.c +0
-0net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 410
Quoted 6 lines
net/eth.c +2
-0@@ -405,6 +405,8 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, struct ip6_ext_hdr *ext_hdr, struct in6_address *dst_addr) { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Warray-bounds"struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr;
eth_parse_ipv6_hdr()callediov_to_buf()to fill the 2 bytes ofext_hdr.net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 412
Quoted 1 line
net/eth.c +0
-0if ((rthdr->rtype == 2) &&Here we access after the 2 bytes filled...
rthdr->rtypeis somewhere on eth_parse_ipv6_hdr's stack, its content is unknown.net/eth.c _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, · line 431
Quoted 5 lines
net/eth.c +1
-0@@ -426,6 +428,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags, }return false; +#pragma GCC diagnostic pop
PATCH v3 2/2 s390x: Use strpadcpy for copying vm name
In reply to Miroslav RezaninaUsing strncpy with length equal to the size of target array, GCC 11 reports following warning:
warning: '__builtin_strncpy' specified bound 256 equals destination size [-Wstringop-truncation]
We can prevent this warning by using strpadcpy that copies string up to specified length, zeroes target array after copied string and does not raise warning when length is equal to target array size (and ending '\0' is discarded).
--- target/s390x/kvm.c | 12 +++++------- target/s390x/misc_helper.c | 7 +++++-- 2 files changed, 10 insertions(+), 9 deletions(-)
target/s390x/kvm.c +5 -7
@@ -29,6 +29,7 @@#include "internal.h" #include "kvm_s390x.h" #include "sysemu/kvm_int.h" +#include "qemu/cutils.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h"
@@ -1910,18 +1911,15 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) strlen(qemu_name))); } sysib.vm[0 ].ext_name_encoding =2 ;/* 2 = UTF-8 */ -memset (sysib.ext_names[0 ],0 ,sizeof (sysib.ext_names[0 ]));/* If hypervisor specifies zero Extended Name in STSI322 SYSIB, it's * considered by s390 as not capable of providing any Extended Name. * Therefore if no name was specified on qemu invocation, we go with the * same "KVMguest" default, which KVM has filled into short name field. */ -if (qemu_name) { -strncpy ((char *)sysib.ext_names[0 ], qemu_name, -sizeof (sysib.ext_names[0 ])); - }else { -strcpy ((char *)sysib.ext_names[0 ],"KVMguest" ); - } +strpadcpy ((char *)sysib.ext_names[0 ], +sizeof (sysib.ext_names[0 ]), + qemu_name ?:"KVMguest" ,'\0' ); +/* Insert UUID */ memcpy (sysib.vm[0 ].uuid, &qemu_uuid,sizeof (sysib.vm[0 ].uuid));
target/s390x/misc_helper.c +5 -2
@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "qemu/main-loop.h" #include "cpu.h" #include "internal.h"
@@ -369,8 +370,10 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, uint64_t r0, uint64_t r1)ebcdic_put (sysib.sysib_322.vm[0 ].name, qemu_name,MIN (sizeof (sysib.sysib_322.vm[0 ].name),strlen (qemu_name))); -strncpy ((char *)sysib.sysib_322.ext_names[0 ], qemu_name, -sizeof (sysib.sysib_322.ext_names[0 ])); +strpadcpy ((char *)sysib.sysib_322.ext_names[0 ], +sizeof (sysib.sysib_322.ext_names[0 ]), + qemu_name,'\0' ); + }else {ebcdic_put (sysib.sysib_322.vm[0 ].name,"TCGguest" ,8 );strcpy ((char *)sysib.sysib_322.ext_names[0 ],"TCGguest" );
Signature · 1 line
2.18.4
Re: [PATCH v3 2/2] s390x: Use strpadcpy for copying vm name
Quoted 67 lines · Miroslav Rezanina
Using strncpy with length equal to the size of target array, GCC 11 reports following warning:
warning: '
__builtin_strncpy' specified bound 256 equals destination size [-Wstringop-truncation]We can prevent this warning by using strpadcpy that copies string up to specified length, zeroes target array after copied string and does not raise warning when length is equal to target array size (and ending '\0' is discarded).
Signed-off-by Miroslav Rezanina <[email protected]>--- target/s390x/kvm.c | 12 +++++------- target/s390x/misc_helper.c | 7 +++++-- 2 files changed, 10 insertions(+), 9 deletions(-)target/s390x/kvm.c +5
-7@@ -29,6 +29,7 @@#include "internal.h" #include "kvm_s390x.h" #include "sysemu/kvm_int.h" +#include "qemu/cutils.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" @@ -1910,18 +1911,15 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) strlen(qemu_name))); } sysib.vm[0 ].ext_name_encoding =2 ;/* 2 = UTF-8 */ -memset (sysib.ext_names[0 ],0 ,sizeof (sysib.ext_names[0 ]));/* If hypervisor specifies zero Extended Name in STSI322 SYSIB, it's * considered by s390 as not capable of providing any Extended Name. * Therefore if no name was specified on qemu invocation, we go with the * same "KVMguest" default, which KVM has filled into short name field. */ -if (qemu_name) { -strncpy ((char *)sysib.ext_names[0 ], qemu_name, -sizeof (sysib.ext_names[0 ])); - }else { -strcpy ((char *)sysib.ext_names[0 ],"KVMguest" ); - } +strpadcpy ((char *)sysib.ext_names[0 ], +sizeof (sysib.ext_names[0 ]), + qemu_name ?:"KVMguest" ,'\0' ); +/* Insert UUID */ memcpy (sysib.vm[0 ].uuid, &qemu_uuid,sizeof (sysib.vm[0 ].uuid));target/s390x/misc_helper.c +1
-0@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "qemu/main-loop.h" #include "cpu.h" #include "internal.h" @@ -369,8 +370,10 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, uint64_t r0, uint64_t r1) ebcdic_put(sysib.sysib_322.vm[0].name, qemu_name, MIN(sizeof(sysib.sysib_322.vm[0].name),
target/s390x/misc_helper.c uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, uint64_t r0, uint64_t r1) · line 379
Quoted 10 lines
target/s390x/misc_helper.c +4
-2strlen(qemu_name))); -strncpy ((char *)sysib.sysib_322.ext_names[0 ], qemu_name, -sizeof (sysib.sysib_322.ext_names[0 ])); +strpadcpy ((char *)sysib.sysib_322.ext_names[0 ], +sizeof (sysib.sysib_322.ext_names[0 ]), + qemu_name,'\0' ); + }else {ebcdic_put (sysib.sysib_322.vm[0 ].name,"TCGguest" ,8 );strcpy ((char *)sysib.sysib_322.ext_names[0 ],"TCGguest" );
Cornelia Huck
AppliedRe: [PATCH v3 2/2] s390x: Use strpadcpy for copying vm name
In reply to Miroslav RezaninaQuoted 10 lines · On Thu, 14 Jan 2021 08:07:36 +0100 Miroslav Rezanina <[email protected]>…
Using strncpy with length equal to the size of target array, GCC 11 reports following warning:
warning: '
__builtin_strncpy' specified bound 256 equals destination size [-Wstringop-truncation]We can prevent this warning by using strpadcpy that copies string up to specified length, zeroes target array after copied string and does not raise warning when length is equal to target array size (and ending '\0' is discarded).
Quoted 5 lines
Signed-off-by Miroslav Rezanina <[email protected]>--- target/s390x/kvm.c | 12 +++++------- target/s390x/misc_helper.c | 7 +++++-- 2 files changed, 10 insertions(+), 9 deletions(-)
Thanks, applied.