Skip to content

Commit

Permalink
netlink: remove the flex array from struct nlmsghdr
Browse files Browse the repository at this point in the history
commit c73a72f upstream.

I've added a flex array to struct nlmsghdr in
commit 738136a ("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 <keescook@chromium.org>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/all/20221114023927.GA685@u2004-local/
Link: https://lore.kernel.org/r/20221118033903.1651026-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
kuba-moo authored and gregkh committed Oct 10, 2023
1 parent 6cd57f5 commit ff81d1c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions include/uapi/linux/netlink.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,13 @@ 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;
__u16 nlmsg_type;
__u16 nlmsg_flags;
__u32 nlmsg_seq;
__u32 nlmsg_pid;
__u8 nlmsg_data[];
};

/* Flags values */
Expand Down
2 changes: 1 addition & 1 deletion net/netlink/af_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -2458,7 +2458,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));
}

Expand Down

0 comments on commit ff81d1c

Please sign in to comment.