openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

addrlabel: add/delete/get can run without rtnl 

There appears to be no need to use rtnl, addrlabel entries are refcounted
and add/delete is serialized by the addrlabel table spinlock.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Westphal 2017-08-29 13:29:42 +02:00 committed by David S. Miller
parent 34504029b5
commit a6f57028d6
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/ipv6/addrlabel.c
View File

@ -405,6 +405,18 @@ static const struct nla_policy ifal_policy[IFAL_MAX+1] = {
[IFAL_LABEL] = { .len = sizeof(u32), }, [IFAL_LABEL] = { .len = sizeof(u32), },
}; };
static bool addrlbl_ifindex_exists(struct net *net, int ifindex)
{
struct net_device *dev;
rcu_read_lock();
dev = dev_get_by_index_rcu(net, ifindex);
rcu_read_unlock();
return dev != NULL;
}
static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh, static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
@ -439,7 +451,7 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,
switch (nlh->nlmsg_type) { switch (nlh->nlmsg_type) {
case RTM_NEWADDRLABEL: case RTM_NEWADDRLABEL:
if (ifal->ifal_index && if (ifal->ifal_index &&
!__dev_get_by_index(net, ifal->ifal_index)) !addrlbl_ifindex_exists(net, ifal->ifal_index))
return -EINVAL; return -EINVAL;
err = ip6addrlbl_add(net, pfx, ifal->ifal_prefixlen, err = ip6addrlbl_add(net, pfx, ifal->ifal_prefixlen,
@ -548,7 +560,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,
return -EINVAL; return -EINVAL;
if (ifal->ifal_index && if (ifal->ifal_index &&
!__dev_get_by_index(net, ifal->ifal_index)) !addrlbl_ifindex_exists(net, ifal->ifal_index))
return -EINVAL; return -EINVAL;
if (!tb[IFAL_ADDRESS]) if (!tb[IFAL_ADDRESS])
@ -593,10 +605,10 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh,
void __init ipv6_addr_label_rtnl_register(void) void __init ipv6_addr_label_rtnl_register(void)
{ {
__rtnl_register(PF_INET6, RTM_NEWADDRLABEL, ip6addrlbl_newdel, __rtnl_register(PF_INET6, RTM_NEWADDRLABEL, ip6addrlbl_newdel,
NULL, 0); NULL, RTNL_FLAG_DOIT_UNLOCKED);
__rtnl_register(PF_INET6, RTM_DELADDRLABEL, ip6addrlbl_newdel, __rtnl_register(PF_INET6, RTM_DELADDRLABEL, ip6addrlbl_newdel,
NULL, 0); NULL, RTNL_FLAG_DOIT_UNLOCKED);
__rtnl_register(PF_INET6, RTM_GETADDRLABEL, ip6addrlbl_get, __rtnl_register(PF_INET6, RTM_GETADDRLABEL, ip6addrlbl_get,
ip6addrlbl_dump, 0); ip6addrlbl_dump, RTNL_FLAG_DOIT_UNLOCKED);
} }