From nobody Thu Jun 25 17:24:52 2026 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 4gmQfY2h5mz6j3RN for ; Thu, 25 Jun 2026 17:24:53 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmQfY0Pd2z3JBv for ; Thu, 25 Jun 2026 17:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408293; 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=lJsxOeVshFFJuIevOgjdZcSZOV9jqqDhe8L2n+lPOdw=; b=lfb/IdfuP9krCLUZtxoYGIgkXKGsZs0T+nQLl8hgbjxaQxchVgPiEO3yIlCrSDjNgR9DnF taQeHLN0Syb61nTwATPhLOWuyIqx+oexCT6Xye27kwFU7usW5fNYlGEL1vpShoLi0XzGhU TDYPXazRZ0UIvUid7RmbRggVQtMuQrGW+WAtq8d26sypAKDko140EUDtdYur6GFrkZwzTn AanveAcVyWUpt0u2T0I9wr3TcySMYc965ueKKWGhh1u5NGjDZJbx87OkQiWBkcnq+lLRqn mOEkpWJgyni+STisiEYsOKP8CxSRkGb51U4CK5mHuuWy1m5+cp4eGsFaM8nTfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782408293; a=rsa-sha256; cv=none; b=YDRJ2fOKhNXMLimL5aFH7+UH3kvxTc21QFCdHxs3qXqvXiDvb5xl+4Tf51lg79Cd6HZ2tE BgeJqyKK+F1TOjueCQuB3AN7dBTitmTGAQto7afuq4n2V3v7e/i4uI4bzQVCV2WeXYQqvc HboAaqX1L3ShfW+6jcJDKpakVwPHHOQ3zksAAaQ5sFjQtktc2AY2J4TO+3eJMxSu5U9e79 +iOgiq/1DgKRVdqq2ZTR2KxKwOEmIvl3VGwieKxKoM2i1kGKSAEXGGkCUn0rjMYSswYp1H Lr0AhhqOQ1torm5/WMLrab3OLEXgtolfBWXF5NhkPyBMhWr0McRPbTj6Kt9S8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782408293; 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=lJsxOeVshFFJuIevOgjdZcSZOV9jqqDhe8L2n+lPOdw=; b=E4rYFvUhBDbOLJ5aiSHxU17ojRwdWYusN8Xje3U8XYOj4CVh/iFf8w8nHv39N0dMGs9JYn XsWyNI57byWJ4rSUQzeCdn/H+jpsLd0ZbnJEFEMAMCz3+g/McbP0K/QT4LDvEhGd8sJKcj byUJK0oPVVKCYsBURKmDjlr3gtIc6haIt07YH15zQjMgTxr3rK8NWnHOYsP9Fn+jcBysQY I3vkNj/VGje2F7A1Mhit2Mp644F1SOmTTtHpvkgJDBaGLQca5ceWKuHz/PBZmBzWW5quaz BhmPN/KyiHsDFQ+NwpK7FF9x21ctas3DOnQPEAbwu2/XbXOnzPKtDX0Hpn6ssw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmQfX6bJmz1Dxh for ; Thu, 25 Jun 2026 17:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37aab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 17:24:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 95030a914349 - stable/15 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 95030a9143491eb237627b1d7d9b7e8c0661cbea Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 17:24:52 +0000 Message-Id: <6a3d6464.37aab.3a8d3ada@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=95030a9143491eb237627b1d7d9b7e8c0661cbea commit 95030a9143491eb237627b1d7d9b7e8c0661cbea Author: Mark Johnston AuthorDate: 2025-11-24 14:15:27 +0000 Commit: Mark Johnston CommitDate: 2026-06-25 15:33:22 +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") (cherry picked from commit b0c7eaf83d21bbc333e247ab9e136965b3ca54ed) --- 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 5ad941524e19..ec0f8a3486e0 100644 --- a/usr.sbin/bhyve/slirp/slirp-helper.c +++ b/usr.sbin/bhyve/slirp/slirp-helper.c @@ -553,6 +553,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. @@ -560,11 +565,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.