diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-04-26 10:54:31 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-04-26 10:56:24 -0400 |
| commit | e1041e2d13a6e66115eb560acc15cae94d3c84a9 (patch) | |
| tree | d6ae9876acd796e1d5fddfad58465529ab0d81cb | |
| parent | 5e92138405fb743e35203bad695e58e9749aff42 (diff) | |
| download | kernel-e1041e2d13a6e66115eb560acc15cae94d3c84a9.tar.gz kernel-e1041e2d13a6e66115eb560acc15cae94d3c84a9.tar.xz kernel-e1041e2d13a6e66115eb560acc15cae94d3c84a9.zip | |
Avoid unnecessary warnings when deleting a network device
| -rw-r--r-- | ipv4-fib-don-t-warn-when-primary-address-is-missing-.patch | 40 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 43 insertions, 0 deletions
diff --git a/ipv4-fib-don-t-warn-when-primary-address-is-missing-.patch b/ipv4-fib-don-t-warn-when-primary-address-is-missing-.patch new file mode 100644 index 000000000..9e4cf4e0e --- /dev/null +++ b/ipv4-fib-don-t-warn-when-primary-address-is-missing-.patch @@ -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 + diff --git a/kernel.spec b/kernel.spec index d2e342038..9ce5bc628 100644 --- a/kernel.spec +++ b/kernel.spec @@ -650,6 +650,9 @@ Patch701: antenna_select.patch #rhbz 1302071 Patch702: x86-build-Build-compressed-x86-kernels-as-PIE.patch +# Follow on for CVE-2016-3156 +Patch703: ipv4-fib-don-t-warn-when-primary-address-is-missing-.patch + # END OF PATCH DEFINITIONS %endif |