diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2017-06-21 17:34:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-22 13:21:44 -0400 |
commit | 60abc0be96e00ca71bac083215ac91ad2e575096 (patch) | |
tree | fe2faac629a89738ba334d92eab198b800101e99 | |
parent | 8c4354ef590ec8b3b10eb7f29d8c8ae56709b96b (diff) |
ipv6: avoid unregistering inet6_dev for loopback
The per netns loopback_dev->ip6_ptr is unregistered and set to
NULL when its mtu is set to smaller than IPV6_MIN_MTU, this
leads to that we could set rt->rt6i_idev NULL after a
rt6_uncached_list_flush_dev() and then crash after another
call.
In this case we should just bring its inet6_dev down, rather
than unregistering it, at least prior to commit 176c39af29bc
("netns: fix addrconf_ifdown kernel panic") we always
override the case for loopback.
Thanks a lot to Andrey for finding a reliable reproducer.
Fixes: 176c39af29bc ("netns: fix addrconf_ifdown kernel panic")
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: Daniel Lezcano <dlezcano@fr.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: David Ahern <dsahern@gmail.com>
Tested-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv6/addrconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 686c92375e81..1d2dbace42ff 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -3369,6 +3369,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, | |||
3369 | struct net_device *dev = netdev_notifier_info_to_dev(ptr); | 3369 | struct net_device *dev = netdev_notifier_info_to_dev(ptr); |
3370 | struct netdev_notifier_changeupper_info *info; | 3370 | struct netdev_notifier_changeupper_info *info; |
3371 | struct inet6_dev *idev = __in6_dev_get(dev); | 3371 | struct inet6_dev *idev = __in6_dev_get(dev); |
3372 | struct net *net = dev_net(dev); | ||
3372 | int run_pending = 0; | 3373 | int run_pending = 0; |
3373 | int err; | 3374 | int err; |
3374 | 3375 | ||
@@ -3384,7 +3385,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, | |||
3384 | case NETDEV_CHANGEMTU: | 3385 | case NETDEV_CHANGEMTU: |
3385 | /* if MTU under IPV6_MIN_MTU stop IPv6 on this interface. */ | 3386 | /* if MTU under IPV6_MIN_MTU stop IPv6 on this interface. */ |
3386 | if (dev->mtu < IPV6_MIN_MTU) { | 3387 | if (dev->mtu < IPV6_MIN_MTU) { |
3387 | addrconf_ifdown(dev, 1); | 3388 | addrconf_ifdown(dev, dev != net->loopback_dev); |
3388 | break; | 3389 | break; |
3389 | } | 3390 | } |
3390 | 3391 | ||
@@ -3500,7 +3501,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, | |||
3500 | * IPV6_MIN_MTU stop IPv6 on this interface. | 3501 | * IPV6_MIN_MTU stop IPv6 on this interface. |
3501 | */ | 3502 | */ |
3502 | if (dev->mtu < IPV6_MIN_MTU) | 3503 | if (dev->mtu < IPV6_MIN_MTU) |
3503 | addrconf_ifdown(dev, 1); | 3504 | addrconf_ifdown(dev, dev != net->loopback_dev); |
3504 | } | 3505 | } |
3505 | break; | 3506 | break; |
3506 | 3507 | ||