From nobody Wed Jul 1 18:37:57 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 4gr8056Np2z6kMXF for ; Wed, 01 Jul 2026 18:37:57 +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 4gr8055hn4z3sGD for ; Wed, 01 Jul 2026 18:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782931077; 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=tRSuYOzjzBin5h1Ej8U2j2nH5vsjpcmZrIOjFaHVyZk=; b=lp6s2eDjtiNCYucOuM9eGfZjlrdukD+Q6PsCZzmbgwCwEzrScuq4+cvPkDJNq+UtB6dMFI ffn6nyRFKQTdqgz2fUDHVMpb3otxzfaA1DXacBx+CYiYg4jBoDHoNTMcGJD45LKnpyvv8Y LxnBBedpZPcd6uvdu07ay8/G5MCOzqPp0G3rYIjUR9lttCrPR4rCMFnMpNbakG3Oivsj4T i04wDW8pMSMyQywYFXblWdJBLPIfD0mdrOMcVd/m2sF0lCa/fNPGq8QFL19ZQ0PYah/IbA aWxQZdwofax5vEWHHF9sCjvW06lfq5DnPiWoIf63b+aLJpiMCTspd/Ajf3wMfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782931077; a=rsa-sha256; cv=none; b=XvUMOuIyW5qOxXrMkyEPRWenkiGbeK8R810VJXHADt0YhmJm+w9QjYbjfEeGjPTmnCQjxB leJ9ZM4VESypCirz5zk1ipO5Vn/E+0NVmNJRhzRiqW6MytOKL3gSRXBkHSaR0Ir/eyEoqF xLRNHG2dWMoxxmcNduGfL0CyWSbYmZm6iLuBtGDTx5Trkv2RmS2O6zm2MTC7+ytBQsNMQ2 /IVN8YMHq1cZ7AHNAGK0jLHU5tmxOLzamd0ioxsTrK9IbvExDyZRTzurkQxJy+LAju8fGz uPNI8QdfSy8JKeXL+A0rYXTlA2SOPAiGInOONs4SVdCe2tiRnQCpy45cJ3ZgFg== 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=1782931077; 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=tRSuYOzjzBin5h1Ej8U2j2nH5vsjpcmZrIOjFaHVyZk=; b=caeROqq0Gz1HAMep/C6yr3et3bKXwRhRP6oSHHQwPmiia6bpeE84U7vMWAoRTTP/nlaGLh rpAkP6RTXM6Mtyanz9N4Je8LDr5uCI57DVPO1q77SsrpryTSgOS3JmjSzPzs26ROx2r/ry K5D48JXBwrfiMEoKF5F2kj1Nj27+K+HBP8wcJjcI1R8EQEHKkczg5iwgbkVOOVbIWab0Op vEN8tVw+9+RXp6w88zTG0aj9omyr6KNqaC38IrvIrATpEXDd9H+GWM0tTyq8rtpuT+0WNI KyhuRQqyP4iwSMhkJ/UJoQ7ate69qDTGu1P9l157+hs430/i/Frx9ZE3AxqT3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gr80543KTz9TH for ; Wed, 01 Jul 2026 18:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26991 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Jul 2026 18:37:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 6d9bc46cd7fc - main - jail: prevent a null derefence on array parameter assignment 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 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/main X-Git-Reftype: branch X-Git-Commit: 6d9bc46cd7fc48ece597162d3ca413fc9d67b5f0 Auto-Submitted: auto-generated Date: Wed, 01 Jul 2026 18:37:57 +0000 Message-Id: <6a455e85.26991.5166520f@gitrepo.freebsd.org> The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=6d9bc46cd7fc48ece597162d3ca413fc9d67b5f0 commit 6d9bc46cd7fc48ece597162d3ca413fc9d67b5f0 Author: Jamie Gritton AuthorDate: 2026-07-01 18:36:08 +0000 Commit: Jamie Gritton CommitDate: 2026-07-01 18:36:08 +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 --- 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);