|
 |
4ee66c3 |
From 9f79323a0aebccb9915ab8f4b7dcf531578b9cf9 Mon Sep 17 00:00:00 2001
|
|
|
4ee66c3 |
From: Paolo Abeni <pabeni@redhat.com>
|
|
|
4ee66c3 |
Date: Thu, 21 Apr 2016 20:23:31 -0400
|
|
|
4ee66c3 |
Subject: [PATCH] ipv4/fib: don't warn when primary address is missing if
|
|
|
4ee66c3 |
in_dev is dead
|
|
|
4ee66c3 |
|
|
|
4ee66c3 |
After commit fbd40ea0180a ("ipv4: Don't do expensive useless work
|
|
|
4ee66c3 |
during inetdev destroy.") when deleting an interface,
|
|
|
4ee66c3 |
fib_del_ifaddr() can be executed without any primary address
|
|
|
4ee66c3 |
present on the dead interface.
|
|
|
4ee66c3 |
|
|
|
4ee66c3 |
The above is safe, but triggers some "bug: prim == NULL" warnings.
|
|
|
4ee66c3 |
|
|
|
4ee66c3 |
This commit avoids warning if the in_dev is dead
|
|
|
4ee66c3 |
|
|
|
4ee66c3 |
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
|
4ee66c3 |
---
|
|
|
4ee66c3 |
net/ipv4/fib_frontend.c | 6 +++++-
|
|
|
4ee66c3 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
4ee66c3 |
|
|
|
4ee66c3 |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
|
|
|
4ee66c3 |
index 8a9246deccfe..63566ec54794 100644
|
|
|
4ee66c3 |
--- a/net/ipv4/fib_frontend.c
|
|
|
4ee66c3 |
+++ b/net/ipv4/fib_frontend.c
|
|
|
4ee66c3 |
@@ -904,7 +904,11 @@ void fib_del_ifaddr(struct in_ifaddr *ifa, struct in_ifaddr *iprim)
|
|
|
4ee66c3 |
if (ifa->ifa_flags & IFA_F_SECONDARY) {
|
|
|
4ee66c3 |
prim = inet_ifa_byprefix(in_dev, any, ifa->ifa_mask);
|
|
|
4ee66c3 |
if (!prim) {
|
|
|
4ee66c3 |
- pr_warn("%s: bug: prim == NULL\n", __func__);
|
|
|
4ee66c3 |
+ /* if the device has been deleted, we don't perform
|
|
|
4ee66c3 |
+ * address promotion
|
|
|
4ee66c3 |
+ */
|
|
|
4ee66c3 |
+ if (!in_dev->dead)
|
|
|
4ee66c3 |
+ pr_warn("%s: bug: prim == NULL\n", __func__);
|
|
|
4ee66c3 |
return;
|
|
|
4ee66c3 |
}
|
|
|
4ee66c3 |
if (iprim && iprim != prim) {
|
|
|
4ee66c3 |
--
|
|
|
4ee66c3 |
2.5.5
|
|
|
4ee66c3 |
|