diff options
| author |   Florian Westphal <fw@strlen.de> | 2017-08-10 16:53:01 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-10 09:50:22 -0700 |
| commit | 8caa38b56c56ef48af48f8c70fcd7cb4580e0c24 (patch) | |
| tree | 2bfea64354f5fc77b88e1a4b1d84db0de185f7e4 /net/core/rtnetlink.c | |
| parent | rtnetlink: init handler refcounts to 1 (diff) | |
| download | linux-dev-8caa38b56c56ef48af48f8c70fcd7cb4580e0c24.tar.xz linux-dev-8caa38b56c56ef48af48f8c70fcd7cb4580e0c24.zip | |
rtnetlink: fallback to UNSPEC if current family has no doit callback
We need to use PF_UNSPEC in case the requested family has no doit
callback, otherwise this now fails with EOPNOTSUPP instead of running the
unspec doit callback, as before.
Fixes: 6853dd488119 ("rtnetlink: protect handler table with rcu")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 59eda6952bc9..9e9f1419be60 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -4221,6 +4221,12 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, return err; } + doit = READ_ONCE(handlers[type].doit); + if (!doit) { + family = PF_UNSPEC; + handlers = rcu_dereference(rtnl_msg_handlers[family]); + } + flags = READ_ONCE(handlers[type].flags); if (flags & RTNL_FLAG_DOIT_UNLOCKED) { refcount_inc(&rtnl_msg_handlers_ref[family]); |