Commit 03e4deff authored by Kefeng Wang's avatar Kefeng Wang Committed by David S. Miller

ipv6: addrconf: Avoid addrconf_disable_change() using RCU read-side lock

Just like commit 4acd4945 ("ipv6: addrconf: Avoid calling
netdevice notifiers with RCU read-side lock"), it is unnecessary
to make addrconf_disable_change() use RCU iteration over the
netdev list, since it already holds the RTNL lock, or we may meet
Illegal context switch in RCU read-side critical section.
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59cfa789
...@@ -5540,8 +5540,7 @@ static void addrconf_disable_change(struct net *net, __s32 newf) ...@@ -5540,8 +5540,7 @@ static void addrconf_disable_change(struct net *net, __s32 newf)
struct net_device *dev; struct net_device *dev;
struct inet6_dev *idev; struct inet6_dev *idev;
rcu_read_lock(); for_each_netdev(net, dev) {
for_each_netdev_rcu(net, dev) {
idev = __in6_dev_get(dev); idev = __in6_dev_get(dev);
if (idev) { if (idev) {
int changed = (!idev->cnf.disable_ipv6) ^ (!newf); int changed = (!idev->cnf.disable_ipv6) ^ (!newf);
...@@ -5550,7 +5549,6 @@ static void addrconf_disable_change(struct net *net, __s32 newf) ...@@ -5550,7 +5549,6 @@ static void addrconf_disable_change(struct net *net, __s32 newf)
dev_disable_change(idev); dev_disable_change(idev);
} }
} }
rcu_read_unlock();
} }
static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int newf) static int addrconf_disable_ipv6(struct ctl_table *table, int *p, int newf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment