public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: [PATCH 10/10] Allow --userns when pasta spawns a command
Date: Wed, 07 Sep 2022 11:45:09 +1000	[thread overview]
Message-ID: <20220907014509.3480812-11-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20220907014509.3480812-1-david@gibson.dropbear.id.au>

[-- Attachment #1: Type: text/plain, Size: 929 bytes --]

Currently --userns is only allowed when pasta is attaching to an existing
netns or PID, and is prohibited when creating a new netns by spawning a
command or shell.

With the new handling of userns, this check isn't neccessary.  I'm not sure
if there's any use case for --userns with a spawned command, but it's
strictly more flexible and requires zero extra code, so we might as well.

Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
 conf.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/conf.c b/conf.c
index 27d520e..ec191c2 100644
--- a/conf.c
+++ b/conf.c
@@ -561,11 +561,6 @@ static int conf_pasta_ns(int *netns_only, char *userns, char *netns,
 		}
 	}
 
-	if (*userns && !*netns) {
-		err("--userns requires --netns or PID");
-		return -EINVAL;
-	}
-
 	/* Attaching to a netns/PID, with no userns given */
 	if (*netns && !*userns)
 		*netns_only = 1;
-- 
@@ -561,11 +561,6 @@ static int conf_pasta_ns(int *netns_only, char *userns, char *netns,
 		}
 	}
 
-	if (*userns && !*netns) {
-		err("--userns requires --netns or PID");
-		return -EINVAL;
-	}
-
 	/* Attaching to a netns/PID, with no userns given */
 	if (*netns && !*userns)
 		*netns_only = 1;
-- 
2.37.3


      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 ` [PATCH 08/10] Correctly handle --netns-only in pasta_start_ns() David Gibson
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 ` David Gibson [this message]

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-11-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).