Attachment 1446696 Details for Bug 1585078 – [NM PATCH] device: don't try to change MTU on a disconnected device

[patch] [NM PATCH] device: don't try to change MTU on a disconnected device

0001-device-don-t-try-to-change-MTU-on-a-disconnected-dev.patch (text/plain), 1.35 KB, created by Beniamino Galvani on 2018-06-01 13:36:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Beniamino Galvani

Created: 2018-06-01 13:36:35 UTC

Size: 1.35 KB

patch

obsolete

>From 9f0a467eb43ea89d555d213f682ffd94eda1eace Mon Sep 17 00:00:00 2001
>From: Beniamino Galvani <bgalvani@redhat.com>
>Date: Fri, 1 Jun 2018 15:03:27 +0200
>Subject: [PATCH] device: don't try to change MTU on a disconnected device
>
>ip_config_merge_and_apply() can be called without an applied
>connection, but then it calls nm_device_set_ip_config() and tries to
>retrieve the configured MTU, throwing an assertion if the applied
>connection is NULL.
>
>src/devices/nm-device.c: line 8080 (nm_device_get_configured_mtu_for_wired): should not be reached
>
>Since it doesn't make sense apply a MTU from the connection when there
>is no connection, add a check against this.
>---
> src/devices/nm-device.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
>index 9a40a0dd5..cf6baf47a 100644
>--- a/src/devices/nm-device.c
>+++ b/src/devices/nm-device.c
>@@ -8139,8 +8139,10 @@ _commit_mtu (NMDevice *self, const NMIP4Config *config)
> 	if (ifindex <= 0)
> 		return;
> 
>-	if (nm_device_sys_iface_state_is_external_or_assume (self)) {
>-		/* for assumed connections we don't tamper with the MTU. */
>+	if (   !nm_device_get_applied_connection (self)
>+	    || nm_device_sys_iface_state_is_external_or_assume (self)) {
>+		/* we don't tamper with the MTU of disconnected and
>+		 * external/assumed devices. */
> 		return;
> 	}
> 
>-- 
>2.17.0
>

Actions: View | Diff

Attachments on bug 1585078: 1446696 | 1446697