From nobody Mon Nov 24 14:29:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dFSr44HrJz6HHYx for ; Mon, 24 Nov 2025 14:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFSr41l0rz3bp6 for ; Mon, 24 Nov 2025 14:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763994548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SCpmTvyOE/Vhif536izdQTP1znnEtk9fsffZsnisJoU=; b=w/1mwsncr903oaX/ct+2dGO2bocfq52/U4wz4k1oZeuiBzvt8qJCJ4FnPNSrmOwKS1y0gz Jvt0LBWK5hyO8xVfGFjsNkj2tWfVSPfNAOD6ZF1gm4wUitKoqiOERAhpGfm/iAZ55yaoXj g/qlCAZeMHF7ap10onMoFDfSm43mc34tFvsq7DNoou+t4spxZgDKOdBxAPqxwXkD5QJXqt 38Y5AynEs7IQ/dfEwwgv4grDIfHZeh8bgxrG/CmhFKIjKpvWXfVSTRXzGfYb81dFUcTLy3 gjbiBKIx4Xk7JDivpWePWqOuZftNMguFwY4UY4BLWDtQXnwCbsjx6m+6wSTFDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763994548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SCpmTvyOE/Vhif536izdQTP1znnEtk9fsffZsnisJoU=; b=mjBxzBQ3dF/wP2ibZhFk8grtnxy/Fitcs9drH+5Ty/qRgUfwYrf0+5qx9X2SRGTTSB9LVG a3HsHgDKn9f5dqISTx9rIlzcbS0VlocftyfQ+T/V70lnY+Sn5Z3xWTIelkOeuDe41m9E+Q VI8Xea0XtWl2fpgeDFi0OaA2kG9lbie/jxPtWpEbhf8mKh2UaAPndzRShMAzDEKIyiZhIb 8YnCBBamaftl1H+pwdgSuDkyfw0K10tJxe0wq8n5EQjPWnaomr47QncNPU3TAcqV6JqQyA mb4TCJN2SleIPqOq7QfG99gwOGWFtS2h6V+QfCrK+H3mfiwbS+Iukulb/+x3lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763994548; a=rsa-sha256; cv=none; b=Q1tTe1LChHNFB4p8EjSTqv7St4nm4KmkASU/sTeERKLXj9uECGQBW2VweSTk0Ggi6M5Gtp yEKgimWC1UG+lsN8eRU26A2oLnoao6YBi3BzOlX+iI9G4knT4K63ZY72zS7h1GU3szdSPy +fkxZ7O9FG4So6q552FXBtBirmKO7wGdDnPMXnEgdkHlAN0Rmgvb58sMeTQ0crGhrXobCg +gGgc1nsuTDedfWZoCHcIY2RNzuIDuFSBraOIU3XIVKz7DM4e6Jun4oLLUQJQjDUajmICb zcaC/4aiC3TTq0CL6YtmexeU7cVTk0vJOOpTFNx6tJqhEv1NojFRNYQWnSlHWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dFSr41F7Pz3FN for ; Mon, 24 Nov 2025 14:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2d0b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 14:29:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b0c7eaf83d21 - main - bhyve/slirp: Drop privileges before entering capability mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0c7eaf83d21bbc333e247ab9e136965b3ca54ed Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 14:29:08 +0000 Message-Id: <69246bb4.2d0b5.1f05f590@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b0c7eaf83d21bbc333e247ab9e136965b3ca54ed commit b0c7eaf83d21bbc333e247ab9e136965b3ca54ed Author: Mark Johnston AuthorDate: 2025-11-24 14:15:27 +0000 Commit: Mark Johnston CommitDate: 2025-11-24 14:28:42 +0000 bhyve/slirp: Drop privileges before entering capability mode When in restricted mode, the slirp-helper process enters a capsicum sandbox, after which we cannot look up the uid for the "nobody" user. Reverse the order. Reported by: kp Fixes: 0e62ebd20172 ("bhyve: Move the slirp backend out into a separate process") --- usr.sbin/bhyve/slirp/slirp-helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/slirp/slirp-helper.c b/usr.sbin/bhyve/slirp/slirp-helper.c index ee62dd212369..06f393aab724 100644 --- a/usr.sbin/bhyve/slirp/slirp-helper.c +++ b/usr.sbin/bhyve/slirp/slirp-helper.c @@ -547,6 +547,11 @@ main(int argc, char **argv) priv.slirp = slirp; + /* + * Drop root privileges if we have them. + */ + drop_privs(); + /* * In restricted mode, we can enter a Capsicum sandbox without losing * functionality. @@ -554,11 +559,6 @@ main(int argc, char **argv) if (restricted && caph_enter() != 0) err(1, "caph_enter"); - /* - * Drop root privileges if we have them. - */ - drop_privs(); - /* * Enter our main loop. If bhyve goes away, we should observe a hangup * on the socket and exit.