diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2023-08-02 13:15:40 +1000 |
---|---|---|
committer | Stefano Brivio <sbrivio@redhat.com> | 2023-08-04 01:18:02 +0200 |
commit | 6920adda0dce8cc9fb585da658dd983833c2a928 (patch) | |
tree | 3edc7bf9b3ca068da5276249a93e6d0a9a3a70ea /util.c | |
parent | b15ce5b6ceb0ba0cbb91d460c5a745a14c2050df (diff) | |
download | passt-6920adda0dce8cc9fb585da658dd983833c2a928.tar passt-6920adda0dce8cc9fb585da658dd983833c2a928.tar.gz passt-6920adda0dce8cc9fb585da658dd983833c2a928.tar.bz2 passt-6920adda0dce8cc9fb585da658dd983833c2a928.tar.lz passt-6920adda0dce8cc9fb585da658dd983833c2a928.tar.xz passt-6920adda0dce8cc9fb585da658dd983833c2a928.tar.zst passt-6920adda0dce8cc9fb585da658dd983833c2a928.zip |
util: Make ns_enter() a void function and report setns() errors
ns_enter() returns an integer... but it's always zero. If we actually fail
the function doesn't return. Therefore it makes more sense for this to be
a function returning void, and we can remove the cases where we pointlessly
checked its return value.
In addition ns_enter() is usually called from an ephemeral thread created
by NS_CALL(). That means that the exit(EXIT_FAILURE) there usually won't
be reported (since NS_CALL() doesn't wait() for the thread). So, use die()
instead to print out some information in the unlikely event that our
setns() here does fail.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -378,16 +378,14 @@ void procfs_scan_listen(struct ctx *c, uint8_t proto, int ip_version, int ns, * ns_enter() - Enter configured user (unless already joined) and network ns * @c: Execution context * - * Return: 0, won't return on failure + * Won't return on failure * * #syscalls:pasta setns */ -int ns_enter(const struct ctx *c) +void ns_enter(const struct ctx *c) { if (setns(c->pasta_netns_fd, CLONE_NEWNET)) - exit(EXIT_FAILURE); - - return 0; + die("setns() failed entering netns: %s", strerror(errno)); } /** |