From: Jiri Pirko <jiri@resnulli.us>
To: Michal Kubecek <mkubecek@suse.cz>
Cc: "David S. Miller" <davem@davemloft.net>,
Jiri Pirko <jiri@mellanox.com>,
Johannes Berg <johannes@sipsolutions.net>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next] genetlink: do not parse attributes for families with zero maxattr
Date: Thu, 10 Oct 2019 11:31:53 +0200 [thread overview]
Message-ID: <20191010093153.GG2223@nanopsycho> (raw)
In-Reply-To: <20191009164432.AD5D1E3785@unicorn.suse.cz>
Wed, Oct 09, 2019 at 06:44:32PM CEST, mkubecek@suse.cz wrote:
>Commit c10e6cf85e7d ("net: genetlink: push attrbuf allocation and parsing
>to a separate function") moved attribute buffer allocation and attribute
>parsing from genl_family_rcv_msg_doit() into a separate function
>genl_family_rcv_msg_attrs_parse() which, unlike the previous code, calls
>__nlmsg_parse() even if family->maxattr is 0 (i.e. the family does its own
>parsing). The parser error is ignored and does not propagate out of
>genl_family_rcv_msg_attrs_parse() but an error message ("Unknown attribute
>type") is set in extack and if further processing generates no error or
>warning, it stays there and is interpreted as a warning by userspace.
>
>Dumpit requests are not affected as genl_family_rcv_msg_dumpit() bypasses
>the call of genl_family_rcv_msg_doit() if family->maxattr is zero. Do the
>same also in genl_family_rcv_msg_doit().
>
>Fixes: c10e6cf85e7d ("net: genetlink: push attrbuf allocation and parsing to a separate function")
>Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
>---
> net/netlink/genetlink.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
>index ecc2bd3e73e4..c4bf8830eedf 100644
>--- a/net/netlink/genetlink.c
>+++ b/net/netlink/genetlink.c
>@@ -639,21 +639,23 @@ static int genl_family_rcv_msg_doit(const struct genl_family *family,
> const struct genl_ops *ops,
> int hdrlen, struct net *net)
> {
>- struct nlattr **attrbuf;
>+ struct nlattr **attrbuf = NULL;
> struct genl_info info;
> int err;
>
> if (!ops->doit)
> return -EOPNOTSUPP;
>
>+ if (!family->maxattr)
>+ goto no_attrs;
> attrbuf = genl_family_rcv_msg_attrs_parse(family, nlh, extack,
> ops, hdrlen,
> GENL_DONT_VALIDATE_STRICT,
>- family->maxattr &&
> family->parallel_ops);
Please also adjust genl_family_rcv_msg_attrs_free() call arg
below in this function in the similar way.
> if (IS_ERR(attrbuf))
> return PTR_ERR(attrbuf);
>
>+no_attrs:
> info.snd_seq = nlh->nlmsg_seq;
> info.snd_portid = NETLINK_CB(skb).portid;
> info.nlhdr = nlh;
>--
>2.23.0
>
next prev parent reply other threads:[~2019-10-10 9:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 16:44 [PATCH net-next] genetlink: do not parse attributes for families with zero maxattr Michal Kubecek
2019-10-10 8:39 ` Jiri Pirko
2019-10-10 9:13 ` Michal Kubecek
2019-10-10 9:30 ` Jiri Pirko
2019-10-10 9:31 ` Jiri Pirko [this message]
2019-10-10 10:45 ` Michal Kubecek
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=20191010093153.GG2223@nanopsycho \
--to=jiri@resnulli.us \
--cc=davem@davemloft.net \
--cc=jiri@mellanox.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mkubecek@suse.cz \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).