Attention is currently required from: flichtenheld, ordex, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/788?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: sitnl: replace NLMSG_TAIL macro with noinline function
......................................................................
sitnl: replace NLMSG_TAIL macro with noinline function
The NLMSG_TAIL macro is confusing gcc when compiling with -O3, leading
to warnings like:
networking_sitnl.c:143:9: warning: writing 4 bytes into a region of size 0
[-Wstringop-overflow=]
143 | memcpy(RTA_DATA(rta), data, alen);
| ^
networking_sitnl.c:101:21: note: at offset [72, 88] into destination object ‘n’
of size 16
101 | struct nlmsghdr n;
| ^
(Above warnings are critical on Fedora 40 as they are turned into errors)
Replacing the macro with a function is also not effective because gcc
will inline it and get confused again.
The only way out is to write a function that never gets inline'd and
replace the macro with it.
Tested on linux with gcc and clang.
Change-Id: I9306a590a10a7d5cba32abe06d269494fec41ba6
Signed-off-by: Antonio Quartulli <[email protected]>
---
M src/openvpn/networking_sitnl.c
1 file changed, 11 insertions(+), 8 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/88/788/3
diff --git a/src/openvpn/networking_sitnl.c b/src/openvpn/networking_sitnl.c
index f53f5ee..daa0999 100644
--- a/src/openvpn/networking_sitnl.c
+++ b/src/openvpn/networking_sitnl.c
@@ -52,21 +52,24 @@
} \
}
-#define NLMSG_TAIL(nmsg) \
- ((struct rtattr *)(((uint8_t *)(nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
-
#define SITNL_NEST(_msg, _max_size, _attr) \
({ \
- struct rtattr *_nest = NLMSG_TAIL(_msg); \
+ struct rtattr *_nest = sitnl_nlmsg_tail(_msg); \
SITNL_ADDATTR(_msg, _max_size, _attr, NULL, 0); \
_nest; \
})
-#define SITNL_NEST_END(_msg, _nest) \
- { \
- _nest->rta_len = (void *)NLMSG_TAIL(_msg) - (void *)_nest; \
+#define SITNL_NEST_END(_msg, _nest) \
+ { \
+ _nest->rta_len = (void *)sitnl_nlmsg_tail(_msg) - (void *)_nest; \
}
+static __attribute__ ((noinline)) void *
+sitnl_nlmsg_tail(const struct nlmsghdr *nlh)
+{
+ return (unsigned char *)nlh + NLMSG_ALIGN(nlh->nlmsg_len);
+}
+
/**
* Generic address data structure used to pass addresses and prefixes as
* argument to AF family agnostic functions
@@ -130,7 +133,7 @@
return -EMSGSIZE;
}
- rta = NLMSG_TAIL(n);
+ rta = sitnl_nlmsg_tail(n);
rta->rta_type = type;
rta->rta_len = len;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/788?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I9306a590a10a7d5cba32abe06d269494fec41ba6
Gerrit-Change-Number: 788
Gerrit-PatchSet: 3
Gerrit-Owner: ordex <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-Attention: ordex <[email protected]>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
