From nobody Sun Jul 5 02:50:34 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 4gtBn71Dv3z6dcXg for ; Sun, 05 Jul 2026 02:50:35 +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 4gtBn64z3hz4Lng for ; Sun, 05 Jul 2026 02:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783219834; 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=5auJpJ9jY6otRzi4kmfO2Xg6lP+8gFUTe+EqDIciCSQ=; b=ynjHbqEO0ocvBtxRFokJ5rxAzMfpDNItvPtuQ+odZ7BGXQ4KCsbuPGyTkmXobFnyb8lP89 QpvPSIruz50JeUucE3TB7/wmRjuhSL+GjaPsyrRtPPerGpp+Br153XVWDzGbguWvEUSpjq J+/moRuBZlv8dC5pKk+s4D6JcubST0pwe3Rrk9JLkLamBhU9EJ1YvaPx+xdaPqXEdYDuoi i8IdGKa/1qTtPc8IQCWffzGESxgNdSSCXh7v3TB4rMOkX11IFga+7inBb8ZOBjw5YElK9C jfG2qrTuZ9iSdTASTH27K2t21285eqzd8xFyVcQGmBC/BZvzVp0IZhEP9dUwUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783219834; a=rsa-sha256; cv=none; b=YoygMAPPk7rkudc4z+FmohDhelTRq2ZdwFUDxxBSQaydwVTyzrBG390yVVQ/mj8dLAyPKj ht9TRG47M5fsXhDDR58u2kg5HVKnLT9mnyKiVMNmoQ7bHiKM6CeJP8xU+YVaING83oACLH iYE2ON3QPODw1KUehzJuzZlNmsYZB7Ct1eDJloGD8tTTLjaOiNkJX1vXpctKXg31DCn08u Xpt5uXzToR6W7c9vYtEQ5f7qgFyQuyo7QXw+rblaW3EryhGDGMuW/H8o6ACH4OBIFHvnRH 3pUm84yCunWLyDKBcEy9Bje/55fOCTbchR32eMzn8KpTQt+S8FDcD1/KOPoFRQ== 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=1783219834; 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=5auJpJ9jY6otRzi4kmfO2Xg6lP+8gFUTe+EqDIciCSQ=; b=Q0hInmF7yW+/521n+S+awOaSKFHVxyPr8EeB2oCChAEFGZQvG/k3jWMNAdIVOJ/QgmO18s 8SpASzc53am46cccGq2JjnMQz0pYHvck+PMjF0XXkSdNNBVbmSdbeb/X7Ay97DD6zUOnb0 ueGFwaz+XBrRzj3oIB83ZW3KjwpPuJIbXfL8pcqFOTYQrfef7zVTLs3Y+fX4R8j672bUhx Wjj/Qj1fwohdX/2yq8vQxTnpfVfPrAN5ExLzkbG02309bE2kxKhvC5XCZFCib1yEZuZbDW NRjti7Qe8KMLiy/YzylybsBwAL3jPUuu28xSx0N9kIKNbL0Q8zB36TQ2VuonSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gtBn63kqNzyrP for ; Sun, 05 Jul 2026 02:50:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 443f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 05 Jul 2026 02:50:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: aca9811160f4 - stable/15 - jail: prevent a null derefence on array parameter assignment 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: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: aca9811160f4dd9e6ed94b8b08ad2285e3390c1c Auto-Submitted: auto-generated Date: Sun, 05 Jul 2026 02:50:34 +0000 Message-Id: <6a49c67a.443f0.3afbb284@gitrepo.freebsd.org> The branch stable/15 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=aca9811160f4dd9e6ed94b8b08ad2285e3390c1c commit aca9811160f4dd9e6ed94b8b08ad2285e3390c1c Author: Jamie Gritton AuthorDate: 2026-07-01 18:36:08 +0000 Commit: Jamie Gritton CommitDate: 2026-07-05 02:49:58 +0000 jail: prevent a null derefence on array parameter assignment The same variable was used as a counter for an inner and out loop. Add a new one for the inner loop. PR: 283934 Reported by: crest at rlwinm.de (cherry picked from commit 6d9bc46cd7fc48ece597162d3ca413fc9d67b5f0) --- usr.sbin/jail/config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index 188f48732561..cc05c2916ca0 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -134,7 +134,7 @@ load_config(const char *cfname) struct cfparams opp; struct cfjail *j, *tj, *wj; struct cfparam *p, *vp, *tp; - struct cfstring *s, *vs, *ns; + struct cfstring *s, *vs, *ns, *cs; struct cfvar *v, *vv; char *ep; int did_self, jseq, pgen; @@ -246,13 +246,14 @@ load_config(const char *cfname) while ((vv = STAILQ_NEXT(vv, tq))) vv->pos += vs->len; s->len += vs->len; + cs = s; while ((vs = TAILQ_NEXT(vs, tq))) { ns = emalloc(sizeof(struct cfstring)); ns->s = estrdup(vs->s); ns->len = vs->len; STAILQ_INIT(&ns->vars); - TAILQ_INSERT_AFTER(&p->val, s, ns, tq); - s = ns; + TAILQ_INSERT_AFTER(&p->val, cs, ns, tq); + cs = ns; } free_var: free(v->name);