From nobody Sun Jul 5 02:50:32 2026 X-Original-To: dev-commits-src-branches@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 4gtBn45b81z6dcm8 for ; Sun, 05 Jul 2026 02:50:32 +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 4gtBn44xjbz4Lnc for ; Sun, 05 Jul 2026 02:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783219832; 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=w6vgV+VY+yYQo8sF1R+NWb3I1lb7J0ukWoIW0Upzjho=; b=Ir4fTfj6L0RYjcneOanR2SfYRPjfbkBi3preHQVQG9nVKb3b3UPXe6vSiWcsI75yZcPQnB ZpXfdBjpn/miFIksfEQ/G4uurKtK9PuE/otyIkucY/11l0cooQbSIpbQSCcKCvKzNPbZoF H3LgJXmt+NJY+R0Py9YVcL3Gspg3nbd/vYSYDpm37afBu3UaF+7LxwGrPw7im+NxE9dfkG Y3VouAj3XEMGcUMp0El1Sj+SdvCeKVfBj2hRW1eCUWHsF+lvO2CsTVX4RL53h6UpYUYXCM vVAOc4dJCNyu2qVc9ItBA6TPbn8uEy7JEK3xo1w00GkuqKQWEYYd1008EF/4vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783219832; a=rsa-sha256; cv=none; b=OBeoraB39GHGn9B3LOxWOiv0LEMt8gs1DNckKT3LU/b5D0pbejVcduaILpMXUSROS4vz3m 8bDWAOdJGQH9hTRSzaTt9veAZpWQ3ecAM0ubvPZnRQWXrS2ahdBZEWLorU6rEl1I5dodYy HbwBLvOs37qRA20gn0QPJDy77oxAMe8tQE6oYsGe5yEFpfB0xgNH0Nz8jOfguUkwT/5Ctg tTjmw5jjHmBfQ2ikZv+BbCRuK56GaDL9PhnfpB8dPPOkXcsggfR2P4fqp8ZJuwTNWqId4w m3sPHsaShzhsVBuDBNkg6Ds2pG2IvE28wXAYtxJYGuDgnNFe0HHMGp7O/pb76Q== 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=1783219832; 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=w6vgV+VY+yYQo8sF1R+NWb3I1lb7J0ukWoIW0Upzjho=; b=BzV/sbh+wFF8gle1S2AY0T2PG8+Q8XP6M4RZ+zYw1S94DkBc/uCmFp5n/oDGkdBZLwG2aB wwPLBnGrHm7DrAJDHF5FIzU5x774pc3kQLPR6pV1CxA3SrNl7hMkILokNSqSHGyFmjSH5z 8AF5OFcVdZHcurWK0ySuE7d5fR4KgY3R3SMerxSepQfjpo4/dXjasTDExGNOUhv7hESugs x1MqagEv6Gxq8Giia8eddu8A4WxyvXDyccDRgAyfxsPeJ9+3FMTS8QN/+AxXl0FIhFuLHI b/F3XHsmOUkAJC5zkNvMBdS0iTEXgZmyPVXcLU2oO5dSoTy3arpCzQ3FwUg+Lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gtBn43bDKz102w for ; Sun, 05 Jul 2026 02:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44295 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 05 Jul 2026 02:50:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: cb0b277f71b6 - stable/14 - jail: prevent a null derefence on array parameter assignment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: cb0b277f71b642b6239539a537b94efdae1bfc6d Auto-Submitted: auto-generated Date: Sun, 05 Jul 2026 02:50:32 +0000 Message-Id: <6a49c678.44295.4378440a@gitrepo.freebsd.org> The branch stable/14 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=cb0b277f71b642b6239539a537b94efdae1bfc6d commit cb0b277f71b642b6239539a537b94efdae1bfc6d Author: Jamie Gritton AuthorDate: 2026-07-01 18:36:08 +0000 Commit: Jamie Gritton CommitDate: 2026-07-05 02:49:53 +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 e5aef24f6386..fca08df732b0 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);