From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: [PATCH 08/10] Correctly handle --netns-only in pasta_start_ns()
Date: Wed, 07 Sep 2022 11:45:07 +1000 [thread overview]
Message-ID: <20220907014509.3480812-9-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20220907014509.3480812-1-david@gibson.dropbear.id.au>
[-- Attachment #1: Type: text/plain, Size: 873 bytes --]
--netns-only is supposed to make pasta use only a network namespace, not
a user namespace. However, pasta_start_ns() has this backwards, and if
--netns-only is specified it creates a user namespace but *not* a network
namespace. Correct this.
Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
pasta.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pasta.c b/pasta.c
index 0fd45e4..7eac8e9 100644
--- a/pasta.c
+++ b/pasta.c
@@ -244,8 +244,8 @@ void pasta_start_ns(struct ctx *c, int argc, char *argv[])
pasta_child_pid = clone(pasta_setup_ns,
ns_fn_stack + sizeof(ns_fn_stack) / 2,
- (c->netns_only ? 0 : CLONE_NEWNET) |
- CLONE_NEWIPC | CLONE_NEWPID | CLONE_NEWUSER |
+ (c->netns_only ? 0 : CLONE_NEWUSER) |
+ CLONE_NEWIPC | CLONE_NEWPID | CLONE_NEWNET |
CLONE_NEWUTS,
(void *)&arg);
--
@@ -244,8 +244,8 @@ void pasta_start_ns(struct ctx *c, int argc, char *argv[])
pasta_child_pid = clone(pasta_setup_ns,
ns_fn_stack + sizeof(ns_fn_stack) / 2,
- (c->netns_only ? 0 : CLONE_NEWNET) |
- CLONE_NEWIPC | CLONE_NEWPID | CLONE_NEWUSER |
+ (c->netns_only ? 0 : CLONE_NEWUSER) |
+ CLONE_NEWIPC | CLONE_NEWPID | CLONE_NEWNET |
CLONE_NEWUTS,
(void *)&arg);
--
2.37.3
next prev parent reply other threads:[~2022-09-07 1:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 1:44 [PATCH 00/10] Clean up handling of userns David Gibson
2022-09-07 1:45 ` [PATCH 01/10] Don't store UID & GID persistently in the context structure David Gibson
2022-09-07 1:45 ` [PATCH 02/10] Split checking for root from dropping root privilege David Gibson
2022-09-07 1:45 ` [PATCH 03/10] Consolidate determination of UID/GID to run as David Gibson
2022-09-07 1:45 ` [PATCH 04/10] Safer handling if we can't open /proc/self/uid_map David Gibson
2022-09-07 1:45 ` [PATCH 05/10] Move self-isolation code into a separate file David Gibson
2022-09-07 1:45 ` [PATCH 06/10] Consolidate validation of pasta namespace options David Gibson
2022-09-07 1:45 ` [PATCH 07/10] Clean up and rename conf_ns_open() David Gibson
2022-09-07 1:45 ` David Gibson [this message]
2022-09-07 1:45 ` [PATCH 09/10] Handle userns isolation and dropping root at the same time David Gibson
2022-09-07 1:45 ` [PATCH 10/10] Allow --userns when pasta spawns a command David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220907014509.3480812-9-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).