netlink: remove the flex array from struct nlmsghdr
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 netlink: remove the flex array from struct nlmsghdr
I've added a flex array to struct nlmsghdr in
commit 738136a0e375 ("netlink: split up copies in the ack construction") to allow accessing the data easily. It leads to warnings with clang, if user space wraps this structure into another struct and the flex array is not at the end of the container.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [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 +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
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Thu, 17 Nov 2022 19:39:03 -0800 you wrote:
I've added a flex array to struct nlmsghdr in
commit738136a0e375("netlink: split up copies in the ack construction") to allow accessing the data easily. It leads to warnings with clang, if user space wraps this structure into another struct and the flex array is not at the end of the container.Reviewed-by Kees Cook <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>[...]
Here is the summary with links:
- [net-next] netlink: remove the flex array from struct nlmsghdr
https://git.kernel.org/netdev/net-next/c/c73a72f4cbb4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html