mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

udp: Replace pragma to ignore bogus stringop-overread warning with workaround

Browse source 
Commit c318ffcb4c ("udp: Ignore bogus -Wstringop-overread for
write() from gcc 12.1") uses a gcc pragma to ignore a bogus warning,
which started appearing on gcc 12.1 (aarch64 and x86_64) due to:
  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103483

...but gcc 12.2 has the same issue. Not just that: if LTO is enabled,
the pragma itself is ignored (this wasn't the case with gcc 12.1),
because of:
  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80922

Drop the pragma, and assign a frame (in the networking sense) pointer
from the offset of the Ethernet header in the buffer, then pass it to
write() and pcap(), so that gcc doesn't obsess anymore with the fact
that an Ethernet header is 14 bytes and we're sending more than that.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2022-09-28 20:45:55 +02:00
parent 505a33e9f9
commit 5290b6f13e
2 changed files with 18 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
udp.c
View file

@ -704,11 +704,20 @@ static void udp_sock_fill_data_v4(const struct ctx *c, int n,
b->uh.len = htons(udp4_l2_mh_sock[n].msg_len + sizeof(b->uh)); b->uh.len = htons(udp4_l2_mh_sock[n].msg_len + sizeof(b->uh));
if (c->mode == MODE_PASTA) { if (c->mode == MODE_PASTA) {
PRAGMA_STRINGOP_OVERREAD_IGNORE /* If we pass &b->eh directly to write(), starting from
if (write(c->fd_tap, &b->eh, sizeof(b->eh) + ip_len) < 0) * gcc 12.1, at least on aarch64 and x86_64, we get a bogus
* stringop-overread warning, due to:
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103483
*
* but we can't disable it with a pragma, because it will be
* ignored if LTO is enabled:
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80922
*/
void *frame = (char *)b + offsetof(struct udp4_l2_buf_t, eh);
if (write(c->fd_tap, frame, sizeof(b->eh) + ip_len) < 0)
debug("tap write: %s", strerror(errno)); debug("tap write: %s", strerror(errno));
PRAGMA_STRINGOP_OVERREAD_IGNORE_POP pcap(frame, sizeof(b->eh) + ip_len);
pcap((char *)&b->eh, sizeof(b->eh) + ip_len);
return; return;
} }
@ -805,11 +814,12 @@ static void udp_sock_fill_data_v6(const struct ctx *c, int n,
b->ip6h.hop_limit = 255; b->ip6h.hop_limit = 255;
if (c->mode == MODE_PASTA) { if (c->mode == MODE_PASTA) {
PRAGMA_STRINGOP_OVERREAD_IGNORE /* See udp_sock_fill_data_v4() for the reason behind 'frame' */
if (write(c->fd_tap, &b->eh, sizeof(b->eh) + ip_len) < 0) void *frame = (char *)b + offsetof(struct udp6_l2_buf_t, eh);
if (write(c->fd_tap, frame, sizeof(b->eh) + ip_len) < 0)
debug("tap write: %s", strerror(errno)); debug("tap write: %s", strerror(errno));
PRAGMA_STRINGOP_OVERREAD_IGNORE_POP pcap(frame, sizeof(b->eh) + ip_len);
pcap((char *)&b->eh, sizeof(b->eh) + ip_len);
return; return;
} }

23
util.h
View file

@ -96,29 +96,6 @@ void trace_init(int enable);
(void *)(arg)); \ (void *)(arg)); \
} while (0) } while (0)
#ifdef __has_warning
# if __has_warning("-Wstringop-overread")
# define PRAGMA_STRINGOP_OVERREAD_IGNORE \
_Pragma("GCC diagnostic ignored \"-Wstringop-overread\"")
# define PRAGMA_STRINGOP_OVERREAD_IGNORE_POP \
_Pragma("GCC diagnostic pop")
# else
# define PRAGMA_STRINGOP_OVERREAD_IGNORE
# define PRAGMA_STRINGOP_OVERREAD_IGNORE_POP
# endif
#else
# if defined(__GNUC__) && __GNUC__ >= 11
# define PRAGMA_STRINGOP_OVERREAD_IGNORE \
_Pragma("GCC diagnostic ignored \"-Wstringop-overread\"")
# define PRAGMA_STRINGOP_OVERREAD_IGNORE_POP \
_Pragma("GCC diagnostic pop")
# else
# define PRAGMA_STRINGOP_OVERREAD_IGNORE
# define PRAGMA_STRINGOP_OVERREAD_IGNORE_POP
# endif
#endif
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN
#define L2_BUF_ETH_IP4_INIT \ #define L2_BUF_ETH_IP4_INIT \
{ \ { \