Attachment 1456382 Details for Bug 1593194 – [dist-git PATCH] device: disable rp_filter handling (rh #1593194)

[patch] [dist-git PATCH] device: disable rp_filter handling (rh #1593194)

0001-device-disable-rp_filter-handling-rh-1593194.patch (text/plain), 3.08 KB, created by Beniamino Galvani on 2018-07-04 06:39:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Beniamino Galvani

Created: 2018-07-04 06:39:57 UTC

Size: 3.08 KB

patch

obsolete

>From 3e27119f7960a90f256d3a535ddd7087b9eb8ca5 Mon Sep 17 00:00:00 2001
>From: Beniamino Galvani <bgalvani@redhat.com>
>Date: Wed, 4 Jul 2018 08:28:54 +0200
>Subject: [PATCH] device: disable rp_filter handling (rh #1593194)
>
>Don't change rp_filter in any way, like in previous RHEL 7 releases.
>See also https://bugzilla.redhat.com/show_bug.cgi?id=1492472.
>
>Resolves: #1593194
>---
> 0004-device-disable-rp_filter-handling.patch | 38 ++++++++++++++++++++
> NetworkManager.spec                          |  5 +++
> 2 files changed, 43 insertions(+)
> create mode 100644 0004-device-disable-rp_filter-handling.patch
>
>diff --git a/0004-device-disable-rp_filter-handling.patch b/0004-device-disable-rp_filter-handling.patch
>new file mode 100644
>index 0000000..46c41a4
>--- /dev/null
>+++ b/0004-device-disable-rp_filter-handling.patch
>@@ -0,0 +1,38 @@
>+From 1ce88613e6438f0ab9f50b826929f02408eb8f50 Mon Sep 17 00:00:00 2001
>+From: Beniamino Galvani <bgalvani@redhat.com>
>+Date: Wed, 4 Jul 2018 08:22:12 +0200
>+Subject: [PATCH] device: disable rp_filter handling
>+
>+Don't change rp_filter in any way, like in previous RHEL 7 releases.
>+See also https://bugzilla.redhat.com/show_bug.cgi?id=1492472.
>+
>+https://bugzilla.redhat.com/show_bug.cgi?id=1593194
>+---
>+ src/devices/nm-device.c | 4 ++--
>+ 1 file changed, 2 insertions(+), 2 deletions(-)
>+
>+diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
>+index 613e87034..ac9e1da08 100644
>+--- a/src/devices/nm-device.c
>++++ b/src/devices/nm-device.c
>+@@ -11440,7 +11440,7 @@ nm_device_set_ip_config (NMDevice *self,
>+ 			priv->needs_ip6_subnet = FALSE;
>+ 	}
>+ 
>+-	if (IS_IPv4) {
>++	if (IS_IPv4 && FALSE /* disabled on RHEL */) {
>+ 		if (!nm_device_sys_iface_state_is_external_or_assume (self))
>+ 			ip4_rp_filter_update (self);
>+ 	}
>+@@ -12329,7 +12329,7 @@ queued_ip_config_change (NMDevice *self, int addr_family)
>+ 
>+ 	set_unmanaged_external_down (self, TRUE);
>+ 
>+-	if (IS_IPv4) {
>++	if (IS_IPv4 && FALSE /* disabled on RHEL */) {
>+ 		if (!nm_device_sys_iface_state_is_external_or_assume (self)) {
>+ 			priv->v4_has_shadowed_routes = _v4_has_shadowed_routes_detect (self);;
>+ 			ip4_rp_filter_update (self);
>+-- 
>+2.17.0
>+
>diff --git a/NetworkManager.spec b/NetworkManager.spec
>index 13ce04a..5226803 100644
>--- a/NetworkManager.spec
>+++ b/NetworkManager.spec
>@@ -113,6 +113,7 @@ Source4: 10-slaves-order.conf
> Patch1: 0001-cloned-mac-address-permanent-rh1413312.patch
> Patch2: 0002-nm-wait-online-not-require-nm-service-rh1520865.patch
> Patch3: 0003-dhclient-no-leading-zero-client-id-rh1556983.patch
>+Patch4: 0004-device-disable-rp_filter-handling.patch
> 
> #Patch1000: 1000-something.patch
> 
>@@ -435,6 +436,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
> %patch1 -p1
> %patch2 -p1
> %patch3 -p1
>+%patch4 -p1
> #%patch1000 -p1
> %patch9999 -p1
> 
>@@ -824,6 +826,9 @@ fi
> %endif
> 
> %changelog
>+* Wed Jul  4 2018 Beniamino Galvani <bgalvani@redhat.com> - 
>+- device: disable rp_filter handling (rh #1593194)
>+
> * Sun Jul  1 2018 Thomas Haller <thaller@redhat.com> - 1:1.12.0-1
> - Update to upstream 1.12.0 release (rh #1592311)
> - device: improve MTU handling for VLAN (rh #1586191)
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 1593194: 1456382