nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

phonet: Don't hold RTNL for route_doit().

Browse source 
Now only __dev_get_by_index() depends on RTNL in route_doit().

Let's use dev_get_by_index_rcu() and register route_doit() with
RTNL_FLAG_DOIT_UNLOCKED.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Kuniyuki Iwashima 2024-10-17 11:31:40 -07:00 committed by Paolo Abeni
parent 3deec3b4af
commit 17a1ac0018
1 changed files with 13 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

19
net/phonet/pn_netlink.c
View file

@ -245,8 +245,6 @@ static int route_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
if (!netlink_capable(skb, CAP_SYS_ADMIN)) if (!netlink_capable(skb, CAP_SYS_ADMIN))
return -EPERM; return -EPERM;
ASSERT_RTNL();
err = nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX, err = nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
rtm_phonet_policy, extack); rtm_phonet_policy, extack);
if (err < 0) if (err < 0)
@ -262,16 +260,25 @@ static int route_doit(struct sk_buff *skb, struct nlmsghdr *nlh,
return -EINVAL; return -EINVAL;
ifindex = nla_get_u32(tb[RTA_OIF]); ifindex = nla_get_u32(tb[RTA_OIF]);
dev = __dev_get_by_index(net, ifindex);
if (dev == NULL) rcu_read_lock();
dev = dev_get_by_index_rcu(net, ifindex);
if (!dev) {
rcu_read_unlock();
return -ENODEV; return -ENODEV;
}
if (nlh->nlmsg_type == RTM_NEWROUTE) if (nlh->nlmsg_type == RTM_NEWROUTE)
err = phonet_route_add(dev, dst); err = phonet_route_add(dev, dst);
else else
err = phonet_route_del(dev, dst); err = phonet_route_del(dev, dst);
rcu_read_unlock();
if (!err) if (!err)
rtm_phonet_notify(net, nlh->nlmsg_type, ifindex, dst); rtm_phonet_notify(net, nlh->nlmsg_type, ifindex, dst);
return err; return err;
} }
@ -308,9 +315,9 @@ static const struct rtnl_msg_handler phonet_rtnl_msg_handlers[] __initdata_or_mo
{.owner = THIS_MODULE, .protocol = PF_PHONET, .msgtype = RTM_GETADDR, {.owner = THIS_MODULE, .protocol = PF_PHONET, .msgtype = RTM_GETADDR,
.dumpit = getaddr_dumpit, .flags = RTNL_FLAG_DUMP_UNLOCKED}, .dumpit = getaddr_dumpit, .flags = RTNL_FLAG_DUMP_UNLOCKED},
{.owner = THIS_MODULE, .protocol = PF_PHONET, .msgtype = RTM_NEWROUTE, {.owner = THIS_MODULE, .protocol = PF_PHONET, .msgtype = RTM_NEWROUTE,
.doit = route_doit}, .doit = route_doit, .flags = RTNL_FLAG_DOIT_UNLOCKED},
{.owner = THIS_MODULE, .protocol = PF_PHONET, .msgtype = RTM_DELROUTE, {.owner = THIS_MODULE, .protocol = PF_PHONET, .msgtype = RTM_DELROUTE,
.doit = route_doit}, .doit = route_doit, .flags = RTNL_FLAG_DOIT_UNLOCKED},
{.owner = THIS_MODULE, .protocol = PF_PHONET, .msgtype = RTM_GETROUTE, {.owner = THIS_MODULE, .protocol = PF_PHONET, .msgtype = RTM_GETROUTE,
.dumpit = route_dumpit, .flags = RTNL_FLAG_DUMP_UNLOCKED}, .dumpit = route_dumpit, .flags = RTNL_FLAG_DUMP_UNLOCKED},
}; };