Re: [PATCH net-next] docs: netlink: clarify the historical baggage of Netlink flags
From: Nicolas Dichtel <hidden>
Date: 2022-09-28 15:19:17
Le 28/09/2022 à 16:37, Jakub Kicinski a écrit : [snip]
I was very tempted to send a patch which would validate the top byte of flags in genetlink for new commands, this way we may some day find a truly common (as in enforced by the code) use for the bits. WDYT?
I think it's worth trying it. In the worst case, this could be reverted. It will help to see how people are using these flags. The same kind of patch for rtnetlink could be interesting before someone adds a new flag that overlaps.
quoted hunk ↗ jump to hunk
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 7c136de117eb..0fbaed49e23f 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c@@ -739,6 +739,22 @@ static int genl_family_rcv_msg_doit(const struct genl_family *family, return err; } +static int genl_header_check(struct nlmsghdr *nlh, struct genlmsghdr *hdr) +{ + if (hdr->reserved) + return -EINVAL; + + /* Flags - lower byte check */ + if (nlh->nlmsg_flags & 0xff & ~(NLM_F_REQUEST | NLM_F_ACK | NLM_F_ECHO)) + return -EINVAL; + /* Flags - higher byte check */ + if (nlh->nlmsg_flags & 0xff00 && + nlh->nlmsg_flags & 0xff00 != NLM_F_DUMP) + return -EINVAL; + + return 0; +} + static int genl_family_rcv_msg(const struct genl_family *family, struct sk_buff *skb, struct nlmsghdr *nlh,@@ -757,7 +773,7 @@ static int genl_family_rcv_msg(const struct genl_family *family, if (nlh->nlmsg_len < nlmsg_msg_size(hdrlen)) return -EINVAL; - if (hdr->cmd >= family->resv_start_op && hdr->reserved) + if (hdr->cmd >= family->resv_start_op && genl_header_check(nlh, hdr)) return -EINVAL; if (genl_get_cmd(hdr->cmd, family, &op))