From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: davem@davemloft.net, johannes.berg@intel.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Johannes Berg <johannes@sipsolutions.net>
Subject: Re: [PATCH v2] netlink: do not proceed if dump's start() errs
Date: Thu, 28 Sep 2017 12:40:04 +0200 [thread overview]
Message-ID: <20170928104002.GA25114@zx2c4.com> (raw)
In-Reply-To: <20170927224144.1749-1-Jason@zx2c4.com>
On Thu, Sep 28, 2017 at 12:41:44AM +0200, Jason A. Donenfeld wrote:
> diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
> index 327807731b44..94c11cf0459d 100644
> --- a/net/netlink/af_netlink.c
> +++ b/net/netlink/af_netlink.c
> @@ -2270,10 +2270,13 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
>
> mutex_unlock(nlk->cb_mutex);
>
> + ret = 0;
> if (cb->start)
> - cb->start(cb);
> + ret = cb->start(cb);
> +
> + if (!ret)
> + ret = netlink_dump(sk);
>
> - ret = netlink_dump(sk);
> sock_put(sk);
>
> if (ret)
FYI, using this horrific hack to currently work around bug:
#define KERNEL_VERSION_THAT_HAS_NETLINK_START_FIX KERNEL_VERSION(4, 14, 0) /* Hopefully! */
static int get(struct sk_buff *skb, struct netlink_callback *cb)
{
#if LINUX_VERSION_CODE < KERNEL_VERSION_THAT_HAS_NETLINK_START_FIX
/* https://marc.info/?l=linux-netdev&m=150655213004221&w=2 */
if (!cb->args[0]) {
ret = get_start(cb);
if (ret)
return ret;
}
#endif
...
}
static const struct genl_ops genl_ops[] = {
{
.cmd = CMD_GET,
#if LINUX_VERSION_CODE >= KERNEL_VERSION_THAT_HAS_NETLINK_START_FIX
/* https://marc.info/?l=linux-netdev&m=150655213004221&w=2 */
.start = get_start,
#endif
.dumpit = get,
...
}
}
Gross.
next prev parent reply other threads:[~2017-09-28 10:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-27 12:39 [PATCH] netlink: do not proceed if dump's start() errs Jason A. Donenfeld
2017-09-27 12:50 ` Jason A. Donenfeld
2017-09-27 13:05 ` Johannes Berg
2017-09-27 13:06 ` Jason A. Donenfeld
2017-09-27 22:41 ` [PATCH v2] " Jason A. Donenfeld
2017-09-28 10:40 ` Jason A. Donenfeld [this message]
2017-09-30 6:27 ` David Miller
2017-09-30 6:56 ` Johannes Berg
2017-09-30 15:14 ` David Miller
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=20170928104002.GA25114@zx2c4.com \
--to=jason@zx2c4.com \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--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).