netlink: split up copies in the ack construction
Subsystems (2)
Jakub Kicinski
maintainerPATCH v2 1/1 netlink: split up copies in the ack construction
Clean up the use of unsafe_memcpy() by adding a flexible array at the end of netlink message header and splitting up the header and data copies.
---
v2: change the argument name in the kdoc as well :S
--- include/net/netlink.h | 21 +++++++++++++++++++++ include/uapi/linux/netlink.h | 2 ++ net/netlink/af_netlink.c | 29 ++++++++++++++++++++--------- 3 files changed, 43 insertions(+), 9 deletions(-)
include/net/netlink.h +21 -0
@@ -936,6 +936,27 @@ static inline struct nlmsghdr *nlmsg_put(struct sk_buff *skb, u32 portid, u32 sereturn __nlmsg_put (skb, portid, seq, type, payload, flags); } +/** +* nlmsg_append - Add more data to a nlmsg in a skb +* @skb: socket buffer to store message in +* @size: length of message payload +* +* Append data to an existing nlmsg, used when constructing a message +* with multiple fixed-format headers (which is rare). +* Returns NULL if the tailroom of the skb is insufficient to store +* the extra payload. +*/ +static inline void *nlmsg_append (struct sk_buff *skb,u32 size) +{ +if (unlikely (skb_tailroom (skb) <NLMSG_ALIGN (size))) +return NULL ; + +if (NLMSG_ALIGN (size) - size) +memset (skb_tail_pointer (skb) + size,0 , +NLMSG_ALIGN (size) - size); +return __skb_put (skb,NLMSG_ALIGN (size)); +} +/** * nlmsg_put_answer - Add a new callback based netlink message to an skb * @skb: socket buffer to store message in
include/uapi/linux/netlink.h +2 -0
@@ -48,6 +48,7 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID +* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;
@@ -55,6 +56,7 @@ struct nlmsghdr {__u16 nlmsg_flags;__u32 nlmsg_seq;__u32 nlmsg_pid; +__u8 nlmsg_data[]; };/* Flags values */
net/netlink/af_netlink.c +20 -9
@@ -2499,19 +2499,24 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err, flags |=NLM_F_ACK_TLVS ; skb =nlmsg_new (payload + tlvlen,GFP_KERNEL ); -if (!skb) { -NETLINK_CB (in_skb).sk->sk_err =ENOBUFS ; -sk_error_report (NETLINK_CB (in_skb).sk); -return ; - } +if (!skb) + goto err_bad_put; rep =nlmsg_put (skb,NETLINK_CB (in_skb).portid, nlh->nlmsg_seq, -NLMSG_ERROR , payload, flags); +NLMSG_ERROR ,sizeof (*errmsg), flags); +if (!rep) + goto err_bad_put; errmsg =nlmsg_data (rep); errmsg->error = err; -unsafe_memcpy (&errmsg->msg, nlh, payload >sizeof (*errmsg) - ? nlh->nlmsg_len :sizeof (*nlh), - /* Bounds checked by the skb layer. */); + errmsg->msg = *nlh; + +if (!(flags &NLM_F_CAPPED )) { +if (!nlmsg_append (skb,nlmsg_len (nlh))) + goto err_bad_put; + +memcpy (errmsg->msg.nlmsg_data, nlh->nlmsg_data, +nlmsg_len (nlh)); + }if (tlvlen)netlink_ack_tlv_fill (in_skb, skb, nlh, err, extack);
@@ -2519,6 +2524,12 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,nlmsg_end (skb, rep);nlmsg_unicast (in_skb->sk, skb,NETLINK_CB (in_skb).portid); + +return ; + +err_bad_put: +NETLINK_CB (in_skb).sk->sk_err =ENOBUFS ; +sk_error_report (NETLINK_CB (in_skb).sk); }EXPORT_SYMBOL (netlink_ack);
Signature · 1 line
2.37.3
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 8 lines · On Thu, 27 Oct 2022 14:25:53 -0700 you wrote:
Clean up the use of
unsafe_memcpy()by adding a flexible array at the end of netlink message header and splitting up the header and data copies.Reviewed-by Kees Cook <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>[...]
Here is the summary with links:
- [net-next,v2] netlink: split up copies in the ack construction
https://git.kernel.org/netdev/net-next/c/738136a0e375
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 13 lines · Jakub Kicinski
include/uapi/linux/netlink.h +1
-0@@ -48,6 +48,7 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID +* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;
include/uapi/linux/netlink.h struct nlmsghdr { · line 59
Quoted 4 lines
include/uapi/linux/netlink.h +1
-0@@ -55,6 +56,7 @@ struct nlmsghdr {__u16 nlmsg_flags;__u32 nlmsg_seq;__u32 nlmsg_pid; +__u8 nlmsg_data[];
This breaks compile of iproute2 with clang. It does not like the variable length array in the middle of a struct. While I could re-do the structs in iproute2, I doubt it is alone in being affected by this change.
Jakub Kicinski
maintainerQuoted 15 lines · On Sun, 13 Nov 2022 19:39:27 -0700 David Ahern wrote:
Quoted 14 lines · Jakub Kicinski
include/uapi/linux/netlink.h +1
-0@@ -48,6 +48,7 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID +* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;@@ -55,6 +56,7 @@ struct nlmsghdr {__u16 nlmsg_flags;
Quoted 8 lines
include/uapi/linux/netlink.h struct nlmsghdr { · line 59
Quoted 3 lines
include/uapi/linux/netlink.h +1
-0__u32 nlmsg_seq;__u32 nlmsg_pid; +__u8 nlmsg_data[];This breaks compile of iproute2 with clang. It does not like the variable length array in the middle of a struct. While I could re-do the structs in iproute2, I doubt it is alone in being affected by this change.
Kees, would you mind lending your expertise?
Not sure why something like (simplified):
struct top {
struct nlmsghdr hdr;
int tail;
}; generates a warning:
In file included from stat-mr.c:7:
In file included from ./res.h:9:
In file included from ./rdma.h:21:
In file included from ../include/utils.h:17:../include/libnetlink.h:41:18: warning: field 'nlh' with variable sized type 'struct nlmsghdr' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end]
struct nlmsghdr nlh;
^which is not confined to -Wpedantic.
Seems like a useless warning :S
Quoted 16 lines · Jakub Kicinski
Quoted 15 lines · On Sun, 13 Nov 2022 19:39:27 -0700 David Ahern wrote:
Quoted 14 lines · Jakub Kicinski
include/uapi/linux/netlink.h +1
-0@@ -48,6 +48,7 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID +* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;@@ -55,6 +56,7 @@ struct nlmsghdr {__u16 nlmsg_flags;
Quoted 8 lines
Quoted 8 lines
include/uapi/linux/netlink.h struct nlmsghdr { · line 59
Quoted 3 lines
include/uapi/linux/netlink.h +1
-0__u32 nlmsg_seq;__u32 nlmsg_pid; +__u8 nlmsg_data[];This breaks compile of iproute2 with clang. It does not like the variable length array in the middle of a struct. While I could re-do the structs in iproute2, I doubt it is alone in being affected by this change.
Eww.
Quoted 17 lines
Kees, would you mind lending your expertise?
Not sure why something like (simplified):
struct top { struct nlmsghdr hdr; int tail; };generates a warning:
In file included from stat-mr.c:7:
In file included from ./res.h:9:
In file included from ./rdma.h:21:
In file included from../include/utils.h:17:../include/libnetlink.h:41:18: warning: field 'nlh' with variable sized type 'struct nlmsghdr' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end]
Quoted 5 lines
struct nlmsghdr nlh; ^which is not confined to -Wpedantic.
Seems like a useless warning :S
Yeah, this surprises me. But I can certainly reproduce it:
https://godbolt.org/z/fczq8sqbv
Gustavo, do you know what's happening here? GCC (and Clang) get mad about doing this in the same struct:
struct nlmsghdr {
__u32 nlmsg_len;
__u16 nlmsg_flags;
__u32 nlmsg_seq;
__u32 nlmsg_pid;
__u8 nlmsg_data[];
int wat;
};<source>:10:21: error: flexible array member not at end of struct
10 | __u8 nlmsg_data[];
| ^~~~~~~~~~But the overlapping with other composite structs has been used in other areas, I thought? (When I looked at this last, I thought the types just had to overlap, but that doesn't seem to help here.)
-Kees
Signature · 1 line
Kees Cook
[sorry for the dup; resending with Gustavo actually CCed]
Quoted 16 lines · Jakub Kicinski
Quoted 15 lines · On Sun, 13 Nov 2022 19:39:27 -0700 David Ahern wrote:
Quoted 14 lines · Jakub Kicinski
include/uapi/linux/netlink.h +1
-0@@ -48,6 +48,7 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID +* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;@@ -55,6 +56,7 @@ struct nlmsghdr {__u16 nlmsg_flags;
Quoted 8 lines
Quoted 8 lines
include/uapi/linux/netlink.h struct nlmsghdr { · line 59
Quoted 3 lines
include/uapi/linux/netlink.h +1
-0__u32 nlmsg_seq;__u32 nlmsg_pid; +__u8 nlmsg_data[];This breaks compile of iproute2 with clang. It does not like the variable length array in the middle of a struct. While I could re-do the structs in iproute2, I doubt it is alone in being affected by this change.
Eww.
Quoted 17 lines
Kees, would you mind lending your expertise?
Not sure why something like (simplified):
struct top { struct nlmsghdr hdr; int tail; };generates a warning:
In file included from stat-mr.c:7:
In file included from ./res.h:9:
In file included from ./rdma.h:21:
In file included from../include/utils.h:17:../include/libnetlink.h:41:18: warning: field 'nlh' with variable sized type 'struct nlmsghdr' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end]
Quoted 5 lines
struct nlmsghdr nlh; ^which is not confined to -Wpedantic.
Seems like a useless warning :S
Yeah, this surprises me. But I can certainly reproduce it:
https://godbolt.org/z/fczq8sqbv
Gustavo, do you know what's happening here? GCC (and Clang) get mad about doing this in the same struct:
struct nlmsghdr {
__u32 nlmsg_len;
__u16 nlmsg_flags;
__u32 nlmsg_seq;
__u32 nlmsg_pid;
__u8 nlmsg_data[];
int wat;
};<source>:10:21: error: flexible array member not at end of struct
10 | __u8 nlmsg_data[];
| ^~~~~~~~~~But the overlapping with other composite structs has been used in other areas, I thought? (When I looked at this last, I thought the types just had to overlap, but that doesn't seem to help here.)
-Kees
Signature · 1 line
Kees Cook
Quoted 26 lines · Kees Cook
Quoted 16 lines · Jakub Kicinski
Quoted 15 lines · On Sun, 13 Nov 2022 19:39:27 -0700 David Ahern wrote:
Quoted 14 lines · Jakub Kicinski
include/uapi/linux/netlink.h +1
-0@@ -48,6 +48,7 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID +* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;@@ -55,6 +56,7 @@ struct nlmsghdr {__u16 nlmsg_flags;Quoted 8 lines
Quoted 8 lines
include/uapi/linux/netlink.h struct nlmsghdr { · line 59
Quoted 3 lines
include/uapi/linux/netlink.h +1
-0__u32 nlmsg_seq;__u32 nlmsg_pid; +__u8 nlmsg_data[];This breaks compile of iproute2 with clang. It does not like the variable length array in the middle of a struct. While I could re-do the structs in iproute2, I doubt it is alone in being affected by this change.
Quoted 4 lines
Eww.
Quoted 2 lines
Kees, would you mind lending your expertise?
Perhaps this would be better? We could leave the _header_ struct alone, but add the data to the nlmsgerr struct instead?
include/uapi/linux/netlink.h +1 -2
@@ -48,7 +48,6 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID -* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;
@@ -56,7 +55,6 @@ struct nlmsghdr {__u16 nlmsg_flags;__u32 nlmsg_seq;__u32 nlmsg_pid; -__u8 nlmsg_data[]; };/* Flags values */
@@ -121,6 +119,7 @@ struct nlmsghdr {struct nlmsgerr {int error;struct nlmsghdr msg; +__u8 data[];/* * followed by the message contents unless NETLINK_CAP_ACK was set * or the ACK indicates success (error == 0)
net/netlink/af_netlink.c +1 -2
@@ -2514,8 +2514,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,if (!nlmsg_append (skb,nlmsg_len (nlh))) goto err_bad_put; -memcpy (errmsg->msg.nlmsg_data, nlh->nlmsg_data, -nlmsg_len (nlh)); +memcpy (errmsg->data,nlmsg_data (nlh),nlmsg_len (nlh)); }if (tlvlen)
Signature · 1 line
Kees Cook
Quoted 18 lines · Kees Cook
Quoted 17 lines · Kees Cook
Quoted 16 lines · Jakub Kicinski
Quoted 15 lines · On Sun, 13 Nov 2022 19:39:27 -0700 David Ahern wrote:
Quoted 14 lines · Jakub Kicinski
include/uapi/linux/netlink.h +1
-0@@ -48,6 +48,7 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID +* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;@@ -55,6 +56,7 @@ struct nlmsghdr {__u16 nlmsg_flags;
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/uapi/linux/netlink.h struct nlmsghdr {
Quoted 3 lines
include/uapi/linux/netlink.h +1
-0__u32 nlmsg_seq;__u32 nlmsg_pid; +__u8 nlmsg_data[];This breaks compile of iproute2 with clang. It does not like the variable length array in the middle of a struct. While I could re-do the structs in iproute2, I doubt it is alone in being affected by this change.
Yep; this is a fine Clang warning. We cannot have a variable length object immediately followed by another object because that would cause undefined behavior.
Quoted 22 lines
Quoted 5 lines
Eww.
Quoted 2 lines
Kees, would you mind lending your expertise?
Perhaps this would be better? We could leave the _header_ struct alone, but add the data to the nlmsgerr struct instead?
include/uapi/linux/netlink.h +0
-1@@ -48,7 +48,6 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID -* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;
include/uapi/linux/netlink.h struct nlmsghdr { · line 58
Quoted 5 lines
include/uapi/linux/netlink.h +0
-1@@ -56,7 +55,6 @@ struct nlmsghdr {__u16 nlmsg_flags;__u32 nlmsg_seq;__u32 nlmsg_pid; -__u8 nlmsg_data[]; };
This seems to be a sensible change. In general, it's not a good idea to have variable length objects (flex-array members) in structures used as headers, and that we know will ultimately be followed by more objects when embedded inside other structures.
Quoted 17 lines
include/uapi/linux/netlink.h +1
-0/* Flags values */ @@ -121,6 +119,7 @@ struct nlmsghdr {struct nlmsgerr {int error;struct nlmsghdr msg; +__u8 data[];/* * followed by the message contents unless NETLINK_CAP_ACK was set * or the ACK indicates success (error == 0) net/netlink/af_netlink.c +0
-0
net/netlink/af_netlink.c void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err, · line 2520
Quoted 9 lines
net/netlink/af_netlink.c +1
-2@@ -2514,8 +2514,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,if (!nlmsg_append (skb,nlmsg_len (nlh))) goto err_bad_put; -memcpy (errmsg->msg.nlmsg_data, nlh->nlmsg_data, -nlmsg_len (nlh)); +memcpy (errmsg->data,nlmsg_data (nlh),nlmsg_len (nlh)); }if (tlvlen)
--
Gustavo
Jakub Kicinski
maintainerQuoted 11 lines · On Wed, 16 Nov 2022 18:55:36 -0600 Gustavo A. R. Silva wrote:
include/uapi/linux/netlink.h struct nlmsghdr { · line 58
Quoted 6 lines
include/uapi/linux/netlink.h +0
-1@@ -56,7 +55,6 @@ struct nlmsghdr {__u16 nlmsg_flags;__u32 nlmsg_seq;__u32 nlmsg_pid; -__u8 nlmsg_data[]; };This seems to be a sensible change. In general, it's not a good idea to have variable length objects (flex-array members) in structures used as headers, and that we know will ultimately be followed by more objects when embedded inside other structures.
Meaning we should go back to zero-length arrays instead? Will this not bring back out-of-bound warnings that Kees has been fixing?
Is there something in the standard that makes flexible array at the end of an embedded struct a problem?
Or it's just unlikely compiler people will budge?
AFAICT this is just one of 3 such structs which iproute2 build hits.
Quoted 13 lines · Jakub Kicinski
Quoted 11 lines · On Wed, 16 Nov 2022 18:55:36 -0600 Gustavo A. R. Silva wrote:
include/uapi/linux/netlink.h struct nlmsghdr { · line 58
Quoted 6 lines
include/uapi/linux/netlink.h +0
-1@@ -56,7 +55,6 @@ struct nlmsghdr {__u16 nlmsg_flags;__u32 nlmsg_seq;__u32 nlmsg_pid; -__u8 nlmsg_data[]; };This seems to be a sensible change. In general, it's not a good idea to have variable length objects (flex-array members) in structures used as headers, and that we know will ultimately be followed by more objects when embedded inside other structures.
Quoted 1 line
Meaning we should go back to zero-length arrays instead?
No.
Quoted 2 lines
Is there something in the standard that makes flexible array at the end of an embedded struct a problem?
I haven't seen any problems ss long as the flex-array appears last:
struct foo {
... members
struct boo {
... members
char flex[];
};
};struct complex {
... members
struct foo embedded;
};However, the GCC docs[1] mention this:
"A structure containing a flexible array member [..] may not be a member of a structure [..] (However, these uses are permitted by GCC as extensions.)"
And in this case it seems that's the reason why GCC doesn't complain?
--
Gustavo
[1] https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Zero-Length.html#Zero-Length
Jakub Kicinski
maintainerQuoted 9 lines · On Wed, 16 Nov 2022 19:20:51 -0600 Gustavo A. R. Silva wrote:
Quoted 6 lines · Jakub Kicinski
Quoted 4 lines
This seems to be a sensible change. In general, it's not a good idea to have variable length objects (flex-array members) in structures used as headers, and that we know will ultimately be followed by more objects when embedded inside other structures.
Meaning we should go back to zero-length arrays instead?
No.
I was asking based on your own commit 1e6e9d0f4859 ("uapi: revert flexible-array conversions"). This is uAPI as well.
Since we can't prevent user space from wrapping structures seems like adding a flex member to an existing struct should never be permitted in uAPI headers? We can just wrap things locally, I guess:
net/netlink/af_netlink.c +7 -5
@@ -2479,7 +2479,10 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err, {struct sk_buff *skb;struct nlmsghdr *rep; -struct nlmsgerr *errmsg; +struct hashtag_silly { +struct nlmsgerr err; +u8 data[]; + } *errmsg;size_t payload =sizeof (*errmsg);struct netlink_sock *nlk =nlk_sk (NETLINK_CB (in_skb).sk);unsigned int flags =0 ;
@@ -2507,15 +2510,14 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,if (!rep) goto err_bad_put; errmsg =nlmsg_data (rep); - errmsg->error = err; - errmsg->msg = *nlh; + errmsg->err.error = err; + errmsg->err.msg = *nlh;if (!(flags &NLM_F_CAPPED )) {if (!nlmsg_append (skb,nlmsg_len (nlh))) goto err_bad_put; -memcpy (errmsg->msg.nlmsg_data, nlh->nlmsg_data, -nlmsg_len (nlh)); +memcpy (errmsg->data,nlmsg_data (nlh),nlmsg_len (nlh)); }if (tlvlen)
In this particular case, tho, we're probably better off giving up on the flex array and doing nlmsg_data() on both src and dst.
Quoted 18 lines
Quoted 2 lines
Is there something in the standard that makes flexible array at the end of an embedded struct a problem?
I haven't seen any problems ss long as the flex-array appears last:
struct foo { ... members struct boo { ... members char flex[]; }; };struct complex { ... members struct foo embedded; };
Quoted 7 lines
However, the GCC docs[1] mention this:
"A structure containing a flexible array member [..] may not be a member of a structure [..] (However, these uses are permitted by GCC as extensions.)"
And in this case it seems that's the reason why GCC doesn't complain?
Seems so, clang's warning is called -Wgnu-variable-sized-type-not-at-end
Quoted 7 lines · On Wed, 16 Nov 2022 22:13:06 -0800 Jakub Kicinski <[email protected]> wrote:
Quoted 6 lines · On Wed, 16 Nov 2022 19:20:51 -0600 Gustavo A. R. Silva wrote:
Quoted 5 lines · Jakub Kicinski
Quoted 4 lines
This seems to be a sensible change. In general, it's not a good idea to have variable length objects (flex-array members) in structures used as headers, and that we know will ultimately be followed by more objects when embedded inside other structures.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Meaning we should go back to zero-length arrays instead?
No.
I was asking based on your own commit
1e6e9d0f4859("uapi: revert flexible-array conversions"). This is uAPI as well.
Some of the flex-array conversions fixed build warnings that occur in iproute2 when using Gcc 12 or later.
Jakub Kicinski
maintainerQuoted 5 lines · On Thu, 17 Nov 2022 08:25:56 -0800 Stephen Hemminger wrote:
Quoted 2 lines
I was asking based on your own commit
1e6e9d0f4859("uapi: revert flexible-array conversions"). This is uAPI as well.Some of the flex-array conversions fixed build warnings that occur in iproute2 when using Gcc 12 or later.
Alright, this is getting complicated. I'll post a patch to fix the issue I've added and gently place my head back into the sand.
Quoted 9 lines · Jakub Kicinski
Quoted 5 lines · On Thu, 17 Nov 2022 08:25:56 -0800 Stephen Hemminger wrote:
Quoted 2 lines
I was asking based on your own commit
1e6e9d0f4859("uapi: revert flexible-array conversions"). This is uAPI as well.Some of the flex-array conversions fixed build warnings that occur in iproute2 when using Gcc 12 or later.
Alright, this is getting complicated. I'll post a patch to fix the issue I've added and gently place my head back into the sand.
Thanks! I think the path forward is clear. I should not have suggested adding a flex-array member to the "header" struct lo these many moons ago. You and Gustavo are right: we need a separate struct with the header at the beginning, just as iproute2 is doing itself.
As for testing, I can do that if you want -- the goal was to make sure the final result doesn't trip FORTIFY when built with -fstrict-flex-arrays (not yet in a released compiler version, but present in both GCC and Clang truck builds) and with __builtin_dynamic_object_size() enabled (which is not yet in -next, as it is waiting on the last of ksize() clean-ups).
Signature · 1 line
Kees Cook
Jakub Kicinski
maintainerQuoted 5 lines · On Thu, 17 Nov 2022 14:35:32 -0800 Kees Cook wrote:
As for testing, I can do that if you want -- the goal was to make sure the final result doesn't trip FORTIFY when built with -fstrict-flex-arrays (not yet in a released compiler version, but present in both GCC and Clang truck builds) and with
__builtin_dynamic_object_size()enabled (which is not yet in -next, as it is waiting on the last ofksize()clean-ups).
I got distracted, sorry. Does this work?
-->8--------------
From: Jakub Kicinski <[email protected]>
Subject: netlink: remove the flex array from struct nlmsghdr
I've added a flex array to struct nlmsghdr to allow accessing the data easily. But it leads to warnings with clang, when user space wraps this structure into another struct and the flex array is not at the end of the container.
--- include/uapi/linux/netlink.h | 2 -- net/netlink/af_netlink.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
include/uapi/linux/netlink.h +0 -2
@@ -48,7 +48,6 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID -* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;
@@ -56,7 +55,6 @@ struct nlmsghdr {__u16 nlmsg_flags;__u32 nlmsg_seq;__u32 nlmsg_pid; -__u8 nlmsg_data[]; };/* Flags values */
net/netlink/af_netlink.c +1 -1
@@ -2514,7 +2514,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,if (!nlmsg_append (skb,nlmsg_len (nlh))) goto err_bad_put; -memcpy (errmsg->msg.nlmsg_data, nlh->nlmsg_data, +memcpy (nlmsg_data (&errmsg->msg),nlmsg_data (nlh),nlmsg_len (nlh)); }
Signature · 1 line
2.38.1
Kees Cook
Reviewed-byQuoted 14 lines · Jakub Kicinski
Quoted 5 lines · On Thu, 17 Nov 2022 14:35:32 -0800 Kees Cook wrote:
As for testing, I can do that if you want -- the goal was to make sure the final result doesn't trip FORTIFY when built with -fstrict-flex-arrays (not yet in a released compiler version, but present in both GCC and Clang truck builds) and with
__builtin_dynamic_object_size()enabled (which is not yet in -next, as it is waiting on the last ofksize()clean-ups).I got distracted, sorry. Does this work?
-->8--------------
From: Jakub Kicinski <[email protected]>
Subject: netlink: remove the flex array from struct nlmsghdr
Quoted 7 lines
I've added a flex array to struct nlmsghdr to allow accessing the data easily. But it leads to warnings with clang, when user space wraps this structure into another struct and the flex array is not at the end of the container.
Thanks! Yes, this seems to be happy with all the future stuff enabled.
-Kees
Quoted 41 lines
--- include/uapi/linux/netlink.h | 2 -- net/netlink/af_netlink.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)include/uapi/linux/netlink.h +0
-2@@ -48,7 +48,6 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID -* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;@@ -56,7 +55,6 @@ struct nlmsghdr {__u16 nlmsg_flags;__u32 nlmsg_seq;__u32 nlmsg_pid; -__u8 nlmsg_data[]; };/* Flags values */ net/netlink/af_netlink.c +1
-1@@ -2514,7 +2514,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,if (!nlmsg_append (skb,nlmsg_len (nlh))) goto err_bad_put; -memcpy (errmsg->msg.nlmsg_data, nlh->nlmsg_data, +memcpy (nlmsg_data (&errmsg->msg),nlmsg_data (nlh),nlmsg_len (nlh)); }Signature · 1 line
2.38.1
Signature · 1 line
Kees Cook
David Ahern
Reviewed-byQuoted 51 lines · Jakub Kicinski
Quoted 5 lines · On Thu, 17 Nov 2022 14:35:32 -0800 Kees Cook wrote:
As for testing, I can do that if you want -- the goal was to make sure the final result doesn't trip FORTIFY when built with -fstrict-flex-arrays (not yet in a released compiler version, but present in both GCC and Clang truck builds) and with
__builtin_dynamic_object_size()enabled (which is not yet in -next, as it is waiting on the last ofksize()clean-ups).I got distracted, sorry. Does this work?
-->8--------------
From: Jakub Kicinski <[email protected]>
Subject: netlink: remove the flex array from struct nlmsghdrI've added a flex array to struct nlmsghdr to allow accessing the data easily. But it leads to warnings with clang, when user space wraps this structure into another struct and the flex array is not at the end of the container.
Signed-off-by Jakub Kicinski <[email protected]>--- include/uapi/linux/netlink.h | 2 -- net/netlink/af_netlink.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)include/uapi/linux/netlink.h +0
-2@@ -48,7 +48,6 @@ struct sockaddr_nl {* @nlmsg_flags: Additional flags * @nlmsg_seq: Sequence number * @nlmsg_pid: Sending process port ID -* @nlmsg_data: Message payload */ struct nlmsghdr {__u32 nlmsg_len;@@ -56,7 +55,6 @@ struct nlmsghdr {__u16 nlmsg_flags;__u32 nlmsg_seq;__u32 nlmsg_pid; -__u8 nlmsg_data[]; };/* Flags values */ net/netlink/af_netlink.c +0
-0
net/netlink/af_netlink.c void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err, · line 2520
Quoted 8 lines
net/netlink/af_netlink.c +1
-1@@ -2514,7 +2514,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err,if (!nlmsg_append (skb,nlmsg_len (nlh))) goto err_bad_put; -memcpy (errmsg->msg.nlmsg_data, nlh->nlmsg_data, +memcpy (nlmsg_data (&errmsg->msg),nlmsg_data (nlh),nlmsg_len (nlh)); }
LGTM and removing the flex array fixes the iproute2 compile.
Quoted 9 lines · On Thu, 17 Nov 2022 12:36:15 -0800 Jakub Kicinski <[email protected]> wrote:
Quoted 5 lines · On Thu, 17 Nov 2022 08:25:56 -0800 Stephen Hemminger wrote:
Quoted 2 lines
I was asking based on your own commit
1e6e9d0f4859("uapi: revert flexible-array conversions"). This is uAPI as well.Some of the flex-array conversions fixed build warnings that occur in iproute2 when using Gcc 12 or later.
Alright, this is getting complicated. I'll post a patch to fix the issue I've added and gently place my head back into the sand.
Building iproute2 with current 6.1-rc5 headers.
Gcc-12 is clean but Clang gets:
CC xfrm_state.o
xfrm_state.c:490:8: warning: field 'u' with variable sized type 'union (unnamed union at xfrm_state.c:486:6)' not at the end of a struct or class is a GNU extension [-Wgnu-variable-sized-type-not-at-end]
} u;
^This problem started with 6.0.