From nobody Wed Apr 22 16:01:38 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 4g13r81rR8z6ZpfT for ; Wed, 22 Apr 2026 16:01:44 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g13r76Gmzz3t6K for ; Wed, 22 Apr 2026 16:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776873703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BpQw3iJf2zUvqu7j9HDGbBdFQS9/2AVwhZWNy99QYNg=; b=SYuiqR/M7hhG8uzQdDTnmH91VODph6lJlxmF+7ulC5e+qiCIvkVY6Tb694ecDmwO70IYhI CQipFCXPIeZ3sSCbEbVH0azF0D2FkNqRze1XZkovb1DHnlx+KEiKFaHQmH6c7D76qD/nIa ZHjvkO7sH30EmLCYpA9uCwrj3oEagR1dekv+7J1XQDmvm2AfIod+TAboU8MQgcqD/887zX gMyOCcNGqqV0C53hOEUMIhYFbuWjegIIC+7C96Nzepu5a+hvhw+iu5/CVVaQnYRrg1GZbk 3917JALTFV1si7agaZADhAGCn1IxJIk0/HDEDEVoInIDFofm9OBmd2Db/1HMjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776873703; a=rsa-sha256; cv=none; b=XTejmVNVogyfFglJbbI5Muf1DGVt9nsHE3yGs6clsU/X1B97liafvuIhHI2pFNUIoJ4axM MhrZPHhOYde7lUac8PM5rA96tgxXz+2wA/QleFTk3uVS1j/hBZV3VQQvmp+DAfbU/0JtXZ VpljWtgePfk8lRoRM/diHcYSt6X+aZpZPBre7mIr0k6QP3jVWSjDq3wLhWBlNwY/ZUrSuQ Y4/SxW5A8IU044iENlVFquEx25Ig61RU4y06mRVUMgJOBrBlQkT2GdxXwsPfcyQNVpIAAB 3w4eIDrsQCO5Z/8jouMkxrvukhovY1hKUK4uOaguSJGIqz5VMD+sVW48d8NMVA== 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=1776873703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BpQw3iJf2zUvqu7j9HDGbBdFQS9/2AVwhZWNy99QYNg=; b=hmpKl9VtWOuZJ8EdC8xUpPr5OG7iDfHlU1vmRDVW/5fXfNJXNW4zqfVbc7mLHWJAZ2fWYB mqc6irC+cI9x+sSQMRoYs/zeKFJblEy1PTpL5HAcEWr+T6Nmz2UVWnfUYyGfDGZMKC7753 135MifLjTDqIZsIEZtGOvLtqoT6xjurrSJXsWEl/j4XXCX5kPzsuu23r3VAoIA9N6j0POn O48w94nb5WAJM0ER/1uPxJ/qe681cTemsYW1oSwBOVB9ZllYhhcR96pqaqKH1JhjZVa80T Q870FOjy+9y3Zt5LtD16eKZSvjrlVWKApKx3NJS7+wCSp9tOz/LlkKvYPQsbfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g13r75ZtnzdhF for ; Wed, 22 Apr 2026 16:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34a71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 16:01:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Zhenlei Huang Subject: git: 588bb16e7bb8 - stable/15 - jail: fix crash with startup commands on a jail without name 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 588bb16e7bb842a1ad551c7814eb96978245995a Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 16:01:38 +0000 Message-Id: <69e8f0e2.34a71.34fc6e8b@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=588bb16e7bb842a1ad551c7814eb96978245995a commit 588bb16e7bb842a1ad551c7814eb96978245995a Author: Gleb Smirnoff AuthorDate: 2026-03-13 20:21:26 +0000 Commit: Zhenlei Huang CommitDate: 2026-04-22 15:59:32 +0000 jail: fix crash with startup commands on a jail without name Jail name is optional, thus don't try setenv(NULL). Fixes: d8f021add40c321c4578da55dae52fb93c7ccb5f (cherry picked from commit 78c4f821f43d530ba1f2a6308a64a8483208ebe3) --- usr.sbin/jail/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c index 9da4fe51673a..8a1d281eff4f 100644 --- a/usr.sbin/jail/command.c +++ b/usr.sbin/jail/command.c @@ -814,8 +814,8 @@ run_command(struct cfjail *j) if (!injail) { if (string_param(j->intparams[KP_JID])) setenv("JID", string_param(j->intparams[KP_JID]), 1); - setenv("JNAME", string_param(j->intparams[KP_NAME]), 1); - + if (string_param(j->intparams[KP_NAME])) + setenv("JNAME", string_param(j->intparams[KP_NAME]), 1); path = string_param(j->intparams[KP_PATH]); setenv("JPATH", path ? path : "", 1); }