From 7a98ee78be7179cab576c31bd323f2593234d9a9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 14 Nov 2017 15:32:39 +0100 Subject: platform: preserve errno when creating netns fails --- src/platform/nmp-netns.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c index 34215828ce..bc305f0170 100644 --- a/src/platform/nmp-netns.c +++ b/src/platform/nmp-netns.c @@ -290,6 +290,7 @@ _netns_new (GError **error) g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_UNKNOWN, "Failed opening netns: %s", g_strerror (errsv)); + errno = errsv; return NULL; } @@ -300,6 +301,7 @@ _netns_new (GError **error) "Failed opening mntns: %s", g_strerror (errsv)); nm_close (fd_net); + errno = errsv; return NULL; } @@ -479,6 +481,7 @@ nmp_netns_new (void) if (!_stack_peek ()) { /* there are no netns instances. We cannot create a new one * (because after unshare we couldn't return to the original one). */ + errno = ENOTSUP; return NULL; } @@ -508,6 +511,7 @@ nmp_netns_new (void) self = _netns_new (&error); if (!self) { + errsv = errno; _LOGE (NULL, "failed to create netns after unshare: %s", error->message); g_clear_error (&error); goto err_out; @@ -518,6 +522,7 @@ nmp_netns_new (void) return self; err_out: _netns_switch_pop (NULL, _CLONE_NS_ALL); + errno = errsv; return NULL; } -- cgit v1.2.1 From b20384fac772a753b493aa28ea39f211d5de6b63 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 14 Nov 2017 15:36:38 +0100 Subject: platform/tests: skip netns tests if we fail to create a new NMPNetns instance nmp_netns_new () might fail with: netns: failed mount --make-rslave: Invalid argument Skip the test in that case. https://bugzilla.gnome.org/show_bug.cgi?id=790214 --- src/platform/tests/test-link.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index 9c72371c33..d3a10bd68f 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -1916,6 +1916,7 @@ _test_netns_check_skip (void) static int support = -1; static int support_errsv = 0; NMPNetns *netns; + gs_unref_object NMPNetns *netns2 = NULL; netns = nmp_netns_get_current (); if (!netns) { @@ -1931,10 +1932,20 @@ _test_netns_check_skip (void) support_errsv = errno; } if (!support) { - _LOGD ("setns() failed with \"%s\". This indicates missing support (valgrind?)", g_strerror (support_errsv)); - g_test_skip ("No netns support (setns failed)"); + _LOGD ("setns() failed with \"%s\". This indicates missing support (valgrind?)", g_strerror (support_errsv)); + g_test_skip ("No netns support (setns failed)"); return TRUE; } + + netns2 = nmp_netns_new (); + if (!netns2) { + /* skip tests for https://bugzilla.gnome.org/show_bug.cgi?id=790214 */ + g_assert_cmpint (errno, ==, EINVAL); + g_test_skip ("No netns support to create another netns"); + return TRUE; + } + nmp_netns_pop (netns2); + return FALSE; } -- cgit v1.2.1