From afdf2a21df407cd9d6dd6a5b60d0f79f358b4966 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 10 Feb 2019 13:46:52 +0100
Subject: [PATCH] device: abort device activation if tc_commit() fails in
 stage2

After we change the device's state to NM_DEVICE_STATE_FAILED,
we must abort processing the current stage.

Fixes: e4bdb219091004f751706aadc39e4fed21e86368
---
 src/devices/nm-device.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index bcb56baeea..2d7efb1aee 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -6501,6 +6501,7 @@ activate_stage2_device_config (NMDevice *self)
 		if (!tc_commit (self)) {
 			_LOGW (LOGD_IP6, "failed applying traffic control rules");
 			nm_device_state_changed (self, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_CONFIG_FAILED);
+			return;
 		}
 
 		if (!nm_device_bring_up (self, FALSE, &no_firmware)) {