From nobody Fri Mar 13 20:27:53 2026 X-Original-To: dev-commits-src-main@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 4fXbdk0P8fz6VjCH for ; Fri, 13 Mar 2026 20:27:54 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXbdj6vF8z3fDV for ; Fri, 13 Mar 2026 20:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773433674; 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=CUp3+wbUp2R2kHurZkROVD8LzblGrxyHaoSpahKH9rY=; b=Ah+2AuUXDBYXF+yoGfQsl0qej+6TN7fgby3FKovQ9JZHkcSgn/ZghTOHeYn5EvP9MusoBe vHuABDO+hKtML/yiPUZm7oq+4SwIc9C/Nc884UrRl8RV99ilwScnhSIgIm7xTJwiXtFbSu tkG+bkczRwOk+cAwfHVowBqnU7goKqleRUaqcp6yGSH73tzdsY1uvK1gwi3McIAvtqX179 yGsKRnQf9EcwKyuX3MPfw/QxGZCOGAvC/9HOdDVDu0IVo5RjwJBEH08RvDqtU0qanbckSm 74NdFQTV1mAEpSxpvkyHd2P3guxP881Q+FH4GoAzyUGhfFXVCP09jum/6SqPlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773433674; a=rsa-sha256; cv=none; b=vHTqY+DLtUX1Htacbq5f41XfuX0lKDF6ZnlconAiUfZPBFnqDRlwPXP2YaWptvHCFXJaxQ TFR2MvbkzdXA8ej17rLMYLUeaJDMINuyXSQqhdKF5gjBbAESwTQ1mioVLSigxPScXd2sak 4eMFVzhD5MMNi70N5JvQ9f2iiSuoo6WJM34yBh57y/s/9wdSGCnALh3yMdArH/Y+gDDdLp 68cdijpWHQ8EeK7fxR2wqKxKaeogG/WeVD65MqKv13Kt0HfxMefQ0g3qrHWa/+SohIp9HK uMmuqxmcfxjJP7Kx4bKz4Gng/htRpjZ8OINZOr8oevAVPfP5BN6nOYrejPLNWA== 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=1773433674; 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=CUp3+wbUp2R2kHurZkROVD8LzblGrxyHaoSpahKH9rY=; b=X787KT+XDiy+65qfvXOUY8yvRYwtJ2wpTUikoTeZy6lgQ6BmktL3WOd5E+7di5Qx6IEXve ilmN3RAv2DixuNXZHJ0fMjYxLzWmx/SkpkTcHXnV4df5mf/Nv2wrzdLzMgiR9aTtPgepc3 l3voeZNEjPcGYJQaMAJFRfNcYY0ytrTCkEFdPgIwdb34D3HPqpxSfYNGL+8GL0FeWUZb76 Ca9OYWigFGwEWQOPM0QCmoSCexekXXwoe9oCLQTmcNVcuBfSSY1PM91Ol5tWmIJbe3UQTp 619eILf69BeDB5sr6+GcTNyX6q47qsAg5caqDARXt21lBJVEJt/19cymqokbLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXbdj62Z5znVb for ; Fri, 13 Mar 2026 20:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c754 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 20:27:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 78c4f821f43d - main - jail: fix crash with startup commands on a jail without name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78c4f821f43d530ba1f2a6308a64a8483208ebe3 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 20:27:53 +0000 Message-Id: <69b47349.3c754.4f134b49@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=78c4f821f43d530ba1f2a6308a64a8483208ebe3 commit 78c4f821f43d530ba1f2a6308a64a8483208ebe3 Author: Gleb Smirnoff AuthorDate: 2026-03-13 20:21:26 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-13 20:27:39 +0000 jail: fix crash with startup commands on a jail without name Jail name is optional, thus don't try setenv(NULL). Fixes: d8f021add40c321c4578da55dae52fb93c7ccb5f --- 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); }