From: Jakub Kicinski <kuba@kernel•org>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, edumazet@google•com, pabeni@redhat•com,
mkubecek@suse•cz, johannes@sipsolutions•net,
Jakub Kicinski <kuba@kernel•org>
Subject: [PATCH net-next 3/6] genetlink: add helper for checking required attrs and use it in devlink
Date: Tue, 23 Aug 2022 21:50:21 -0700 [thread overview]
Message-ID: <20220824045024.1107161-4-kuba@kernel.org> (raw)
In-Reply-To: <20220824045024.1107161-1-kuba@kernel.org>
Add a genetlink wrapper for checking if a required attribute
is present in the root nest. Because we want the offset to
point at the inner-most header we need to differentiate
between families which have userhdr and those which don't.
Only ovs, tipc and drbd access userhdr, and they all have
additional userhdr so it's safe to set userhdr to NULL
for families which depend purely on attributes.
Signed-off-by: Jakub Kicinski <kuba@kernel•org>
---
include/net/genetlink.h | 14 ++++++++++++++
net/netlink/genetlink.c | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 56a50e1c51b9..5da038e1b39e 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -107,6 +107,20 @@ static inline void genl_info_net_set(struct genl_info *info, struct net *net)
#define GENL_SET_ERR_MSG(info, msg) NL_SET_ERR_MSG((info)->extack, msg)
+/* Report that a root attribute is missing */
+#define GENL_REQ_ATTR_CHECK(info, attr) ({ \
+ struct genl_info *__info = (info); \
+ u32 __attr = (attr); \
+ int __retval; \
+ \
+ __retval = !__info->attrs[__attr]; \
+ if (__retval) \
+ NL_SET_ERR_ATTR_MISS(__info->extack, \
+ __info->userhdr ? : __info->genlhdr, \
+ __attr); \
+ __retval; \
+})
+
enum genl_validate_flags {
GENL_DONT_VALIDATE_STRICT = BIT(0),
GENL_DONT_VALIDATE_DUMP = BIT(1),
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 57010927e20a..37805115e637 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -716,7 +716,7 @@ static int genl_family_rcv_msg_doit(const struct genl_family *family,
info.snd_portid = NETLINK_CB(skb).portid;
info.nlhdr = nlh;
info.genlhdr = nlmsg_data(nlh);
- info.userhdr = nlmsg_data(nlh) + GENL_HDRLEN;
+ info.userhdr = family->hdrsize ? nlmsg_data(nlh) + GENL_HDRLEN : NULL;
info.attrs = attrbuf;
info.extack = extack;
genl_info_net_set(&info, net);
--
2.37.2
next prev parent reply other threads:[~2022-08-24 4:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-24 4:50 [PATCH net-next 0/6] netlink: support reporting missing attributes Jakub Kicinski
2022-08-24 4:50 ` [PATCH net-next 1/6] netlink: add support for ext_ack " Jakub Kicinski
2022-08-24 8:09 ` Johannes Berg
2022-08-24 8:13 ` Johannes Berg
2022-08-24 16:36 ` Jakub Kicinski
2022-08-24 4:50 ` [PATCH net-next 2/6] netlink: add helper for extack attr presence checking Jakub Kicinski
2022-08-24 4:50 ` Jakub Kicinski [this message]
2022-08-24 19:44 ` [PATCH net-next 3/6] genetlink: add helper for checking required attrs and use it in devlink Johannes Berg
2022-08-24 22:46 ` Jakub Kicinski
2022-08-24 4:50 ` [PATCH net-next 4/6] devlink: use missing attribute ext_ack Jakub Kicinski
2022-08-24 4:50 ` [PATCH net-next 5/6] ethtool: strset: report missing ETHTOOL_A_STRINGSET_ID via ext_ack Jakub Kicinski
2022-08-24 4:50 ` [PATCH net-next 6/6] ethtool: report missing header via ext_ack in the default handler Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220824045024.1107161-4-kuba@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=mkubecek@suse$(echo .)cz \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox