diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-13 23:28:00 -0400 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-05-06 22:57:05 +1000 |
| commit | f3bad54455dde6aad5ec62bbb115be8120173f7e (patch) | |
| tree | 9466b29eeb7037e255cf7b1a76fdd1409e502abf /net/ipv4/devinet.c | |
| parent | e4941d685b43583bda1d8cc2c8a9662492adcedb (diff) | |
| download | kernel_samsung_smdk4412-f3bad54455dde6aad5ec62bbb115be8120173f7e.zip kernel_samsung_smdk4412-f3bad54455dde6aad5ec62bbb115be8120173f7e.tar.gz kernel_samsung_smdk4412-f3bad54455dde6aad5ec62bbb115be8120173f7e.tar.bz2 | |
ipv4: Don't do expensive useless work during inetdev destroy.
commit fbd40ea0180a2d328c5adc61414dc8bab9335ce2 upstream.
When an inetdev is destroyed, every address assigned to the interface
is removed. And in this scenerio we do two pointless things which can
be very expensive if the number of assigned interfaces is large:
1) Address promotion. We are deleting all addresses, so there is no
point in doing this.
2) A full nf conntrack table purge for every address. We only need to
do this once, as is already caught by the existing
masq_dev_notifier so masq_inet_event() can skip this.
Change-Id: I4b2a3ed665543728451c21465fb90ec89f739135
Reported-by: Solar Designer <solar@openwall.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Tested-by: Cyrill Gorcunov <gorcunov@openvz.org>
[bwh: Backported to 3.2: adjust filename, context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/ipv4/devinet.c')
| -rw-r--r-- | net/ipv4/devinet.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 76db592..085d63f 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -327,6 +327,9 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap, ASSERT_RTNL(); + if (in_dev->dead) + goto no_promotions; + /* 1. Deleting primary ifaddr forces deletion all secondaries * unless alias promotion is set **/ @@ -373,6 +376,7 @@ static void __inet_del_ifa(struct in_device *in_dev, struct in_ifaddr **ifap, fib_del_ifaddr(ifa, ifa1); } +no_promotions: /* 2. Unlink it */ *ifap = ifa1->ifa_next; |