diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2016-04-21 22:23:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-24 23:26:29 -0400 |
| commit | 391a20333b8393ef2e13014e6e59d192c5594471 (patch) | |
| tree | 30e7777eb40f60ec5c2b208d14d10137d5f0c806 /net | |
| parent | 91e019de2ff85fdcadacacb7623dac7a7c522258 (diff) | |
| download | op-kernel-dev-391a20333b8393ef2e13014e6e59d192c5594471.zip op-kernel-dev-391a20333b8393ef2e13014e6e59d192c5594471.tar.gz | |
ipv4/fib: don't warn when primary address is missing if in_dev is dead
After commit fbd40ea0180a ("ipv4: Don't do expensive useless work
during inetdev destroy.") when deleting an interface,
fib_del_ifaddr() can be executed without any primary address
present on the dead interface.
The above is safe, but triggers some "bug: prim == NULL" warnings.
This commit avoids warning if the in_dev is dead
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/fib_frontend.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 8a9246d..63566ec 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -904,7 +904,11 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim) if (ifa->ifa_flags & IFA_F_SECONDARY) { prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask); if (!prim) { - pr_warn("%s: bug: prim == NULL\n", __func__); + /* if the device has been deleted, we don't perform + * address promotion + */ + if (!in_dev->dead) + pr_warn("%s: bug: prim == NULL\n", __func__); return; } if (iprim && iprim != prim) { |
