rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid unnecessary warnings when deleting a network device

This commit is contained in:
Josh Boyer 2016-04-26 10:54:31 -04:00
parent 334e67b414
commit 9d4e21bf3a
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ipv4-fib-don-t-warn-when-primary-address-is-missing-.patch Normal file
View File

@ -0,0 +1,40 @@
From 9f79323a0aebccb9915ab8f4b7dcf531578b9cf9 Mon Sep 17 00:00:00 2001
From: Paolo Abeni <pabeni@redhat.com>
Date: Thu, 21 Apr 2016 20:23:31 -0400
Subject: [PATCH] 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>
---
net/ipv4/fib_frontend.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 8a9246deccfe..63566ec54794 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) {
--
2.5.5

6
kernel.spec
View File

@ -651,6 +651,9 @@ Patch700: USB-usbip-fix-potential-out-of-bounds-write.patch
#rhbz 1309487
Patch701: antenna_select.patch
# Follow on for CVE-2016-3156
Patch702: ipv4-fib-don-t-warn-when-primary-address-is-missing-.patch
# END OF PATCH DEFINITIONS
%endif
@ -1366,6 +1369,9 @@ ApplyPatch USB-usbip-fix-potential-out-of-bounds-write.patch
#rhbz 1309487
ApplyPatch antenna_select.patch
# Follow on for CVE-2016-3156
ApplyPatch ipv4-fib-don-t-warn-when-primary-address-is-missing-.patch
# END OF PATCH APPLICATIONS
%endif