mirror of
https://github.com/hardkernel/linux.git
synced 2026-03-24 19:40:21 +09:00
netlink: remove the flex array from struct nlmsghdr
commitc73a72f4cbupstream. I've added a flex array to struct nlmsghdr in commit738136a0e3("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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
6cd57f5c77
commit
ff81d1c77d
@@ -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 */
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user