From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202606 header.b=OH+vpl9q; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id B7E0D5A0272 for ; Fri, 17 Jul 2026 07:46:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202606; t=1784267197; bh=/gvB1tbjNbw5kVk1Y9q6V+MsJZGCP6/jhAxFCFWhVfI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OH+vpl9qLcg1Il7OtLkYC7IO74yucGwI26gHqz9uw4rpaL3ktjAB6ecKXRoD0AfE0 pdVlQP4PIPEhaNNQhErGG6vaKuCP7YYUv8U740hjzXYfDUn52bnKFBWk1YmENDuPOe /KgNBn9N/nj355ipcohzCNgITQ2P3bQ8Z1UBTwe/RuHBbz0uSdcNc1Fr/hs99VwE1E NRen0FVOLprIlyNYjK9emHMYMDX+kbqEvr2t/F8HJQi3wnbFdYBfynAq623EJtrdrW fqQq0pU8rhgqCvqSkESyDfpyCH+9DjkpbxfFQzkM8LAE2326rpQxbaagcGtzHwGQz3 OzR5jHgAfI48g== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4h1f6j0VLDz4wBB; Fri, 17 Jul 2026 15:46:37 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 3/6] isolation, conf: Set c->fd_tap from early parse of --fd Date: Fri, 17 Jul 2026 15:46:31 +1000 Message-ID: <20260717054634.1293553-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260717054634.1293553-1-david@gibson.dropbear.id.au> References: <20260717054634.1293553-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: VTI7UUVHK6FH27YTC3N5JI45XBW7RFDK X-Message-ID-Hash: VTI7UUVHK6FH27YTC3N5JI45XBW7RFDK X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: We parse --fd twice: once in isolate_initial() just to avoid clobbering the passed in fd. Then we parse it "for real" in conf(), to set c->fd_tap and other configuration variables. Change this, so that we return the value parsed early from isolate_initial() and set c->fd_tap from that. This doesn't accomplish much immediately, but will make some further cleanups possible. Signed-off-by: David Gibson --- conf.c | 2 +- isolation.c | 6 +++++- isolation.h | 2 +- passt.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/conf.c b/conf.c index 5b6cc2be..b3211e54 100644 --- a/conf.c +++ b/conf.c @@ -1593,7 +1593,7 @@ void conf(struct ctx *c, int argc, char **argv) c->fd_control_listen = c->fd_control = -1; break; case 'F': - c->fd_tap = conf_tap_fd(optarg); + /* --fd was parsed early and c->fd_tap set in main() */ c->one_off = true; *c->sock_path = 0; break; diff --git a/isolation.c b/isolation.c index ea85fdba..c9dfefa8 100644 --- a/isolation.c +++ b/isolation.c @@ -257,8 +257,10 @@ void isolate_initial(void) * * Should: * - close all open files except for standard streams and the one from --fd + * + * Return: fd number from --fd, or -1 if not specified */ -void isolate_fds(int argc, char **argv) +int isolate_fds(int argc, char **argv) { const struct option optfd[] = { { "fd", required_argument, NULL, 'F' }, { 0 }, }; @@ -296,6 +298,8 @@ void isolate_fds(int argc, char **argv) die_perror("Failed to close files leaked by parent"); } } + + return fd; } /** diff --git a/isolation.h b/isolation.h index e1b1bc5d..ec470388 100644 --- a/isolation.h +++ b/isolation.h @@ -11,7 +11,7 @@ #include void isolate_initial(void); -void isolate_fds(int argc, char **argv); +int isolate_fds(int argc, char **argv); void isolate_user(const struct ctx *c, uid_t uid, gid_t gid, bool use_userns, const char *userns); int isolate_prefork(const struct ctx *c); diff --git a/passt.c b/passt.c index ce20cedb..e930df43 100644 --- a/passt.c +++ b/passt.c @@ -342,7 +342,7 @@ int main(int argc, char **argv) arch_avx2_exec(argv); isolate_initial(); - isolate_fds(argc, argv); + c->fd_tap = isolate_fds(argc, argv); sigemptyset(&sa.sa_mask); sa.sa_flags = 0; -- 2.55.0