From nobody Thu Apr 23 03:49:59 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 4g1MYM68tJz6bTfD for ; Thu, 23 Apr 2026 03:49:59 +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 4g1MYM1Lh0z44ZL for ; Thu, 23 Apr 2026 03:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776916199; 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=EQiZR7+Wfdu/k/fXPdLbVIC/TF85Gm8LbvjuOpgHNlI=; b=vdeC2X+uviKzGdu/+AE9inHsCoQVHlHgBJKmmVs3H6yuqJqE4YfVluRQihSis+HrQ/6lYE kOpzc9cOimXDKaeNZlA7CZ7GiH5u8wwz4Ey69QTZj6HVv3HRw4ARzmMAq1GD/Lmv/AsArc 6z9UjP2rILyxNvibncGnKkGvMAC7i+NdDkfY8COVJ+AxR1eIXx5G7jkFUydPJ2unU8WyfX AmTDZrrIRNq/FUe7zMsshxky9uV6FEMRCHkpgau7qbD+L1E+IGocAgTH3ZFjBlL+cL9BRT jcbFc5dlhqG8KWzmbNsEzARxiayi54m7zl8S9FRiQoBeu0lyYb/X8ZaW3DfvEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776916199; a=rsa-sha256; cv=none; b=msJH8Wo3UpYLvwHylMl19uEZRGUxs2La6/dp8vqzwI61spmtepN1lxOp3OyX6l46wPpsm+ zrwIjeqLBX0hlyHzNKGrm9conK31vUbVYCDcVSHPxDVul6kipHx5e3+5MN0NJuovylBsF+ 8ISAHToB2NdB3AevJbufTO50Qh7yjxgTmSmcPxWa6k8Q6QYjmsutNagN8dnm1SXBrYFky2 mTJwzQwSRW0iaqv2iFtZGpJNcwEw9bo/H0+ImSfu6bXDJZUiUTiXK3mrDCAZGy2jLEo5n/ jF+z6fm2ylLruh9UDWINdaHmDCgqSw+5Z1Y2bK94vsYpV7w0WFHl4+GF9vzHCA== 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=1776916199; 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=EQiZR7+Wfdu/k/fXPdLbVIC/TF85Gm8LbvjuOpgHNlI=; b=GaKg41of4qe6PL/jQ1/JYNNYDvjg9dxfa0lIoAVeUK0Lv68dtxcktP0TJ89Rgp9e5E5aze 0YyNKOSY725D174PBj0F8Lq/2nCTg6LZtVenKSlu/rIl89CBFjucJjb5vYQ0dfvIL2Fwq+ RMX1ft+x+AuVtV36+aZE6svZVqeQuzftUdMzQ35OqymsTil/Qdyx3MlqFzlrAigV1k4qV9 Ce6j4PEHNp8qZoK2Y6foiyjx/Nv9B1hhtGDiXhhPO5MmNNh01viUKZvrlH5ONx77nvqfyy 9J4aR6GK/IP2Pl7fUmt9gcwv6wbtqcdtr7eoAZpWUSMBQFWzdOzUzbme73AqLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1MYM0DgBz10ZM for ; Thu, 23 Apr 2026 03:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 388e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Apr 2026 03:49:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Gleb Smirnoff From: Kyle Evans Subject: git: c84d08abf732 - stable/14 - 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c84d08abf732deacf082c228c5dbba2bd37ccae3 Auto-Submitted: auto-generated Date: Thu, 23 Apr 2026 03:49:59 +0000 Message-Id: <69e996e7.388e8.573d0080@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c84d08abf732deacf082c228c5dbba2bd37ccae3 commit c84d08abf732deacf082c228c5dbba2bd37ccae3 Author: Gleb Smirnoff AuthorDate: 2026-03-13 20:21:26 +0000 Commit: Kyle Evans CommitDate: 2026-04-23 03:23:13 +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 26eaeca442a9..6c454053f547 100644 --- a/usr.sbin/jail/command.c +++ b/usr.sbin/jail/command.c @@ -792,8 +792,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); }