From nobody Mon Mar 28 23:41:30 2022 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 6C1DF1A46AF1; Mon, 28 Mar 2022 23:41:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KS8NV2dLcz4hCh; Mon, 28 Mar 2022 23:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648510890; 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=ToPKax7LJ3sFl5hbEcqBwNLfJx73h93oRft0m6c/Hl8=; b=nyBTyH6kIfNJpBgU1obnNCHk3irgD3sTfyx4Awx6YMkAGhPZ0ktXJtz2J0dnAe5O8ZFUo9 IOGBGQxSv8A8dBxt085kSCMLUESHqEVMUfpsCtwQV9DVNT4TrGUmDUaRrTPGrsvPToqeh3 DABabmxdDLYnP8cffiwlTMAsrCtd6jchScez24Ltc1vdO/QD8axhDf2h+H4Eh2yUVWK4YH +cDZpdFLceOXA7DJ1jEC7DG4RtppeMmRsmfQSnKS/Zhkl/I1wuQmnvfrWWONCrXI+HOyHr OQyGfQlNpX+tTeOw5wekqg0m1IAqBxk3yIjt0SjBopqV655Se2RrX+MbKy6zEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 38E9413AB3; Mon, 28 Mar 2022 23:41:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22SNfUC4059692; Mon, 28 Mar 2022 23:41:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SNfUdw059691; Mon, 28 Mar 2022 23:41:30 GMT (envelope-from git) Date: Mon, 28 Mar 2022 23:41:30 GMT Message-Id: <202203282341.22SNfUdw059691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: f059a2c832f8 - stable/12 - mfc jail: handle jailsys parameters in modification permission test 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/12 X-Git-Reftype: branch X-Git-Commit: f059a2c832f8cff0d3c0db142a3216b13b4c0480 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648510890; 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=ToPKax7LJ3sFl5hbEcqBwNLfJx73h93oRft0m6c/Hl8=; b=xljL+w6mzpx5isRNwr2KJEfwc4df5V0KEVQrk4otP1V6RmSds0lF/oS9UJlwTRHqVF9ws2 4F9Q5OQAT/+HjA6iEJKRC7WVlhiFpzysPL6tKVOCPuiNPpYb+7P3CEAqDpcm+OHM/+j2aF xbJQupbjzt1YCdw/Q2oTGB8yLYs47eIPZl7/SfNOC9vhU51nE38r0UDD/WmY0vP91sDGaY J3nVRkIhJNy15aZX/Hsk6HC3Mb9N0pcgV30b22xKVUEkuppeNdLwgeCGi81WRMCfeoEm6q OfM98B2G4fzv0xyXq94Yns0+k8R1G9yTJ/RyztBpeRkgmdaxvpyz03jI8qRLHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648510890; a=rsa-sha256; cv=none; b=ltikpjKXM25bCxHteo/J4Q5lC4lfX0vecv/64u++wq+tZicizn563ZECuLj7pN775PXKUt pBil3F2WEQzGjeYWYESJXElAyMjqkJJ7Apf8VL5xe3UAXvJnI6VJrBm3u4vkg7XbUdcvHj T65gjIcV2Vg/je5jYuMZB+EvAskbm8aWWXiXxzH1bCraBnsbcYgfX5G+Z24D3ZVKcBbKKD PPCqt/vD+0LsiEHnsmDALJykSoQd4ZW7Ku+PQzDJEiJjiolZJdtPalWRLrqwCSLFW+ly51 7pnMfCafG6KF1bdR59yNf+zY967nO4H1NxPz9vn7c69/sqiYslf7qF8rvbRWBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=f059a2c832f8cff0d3c0db142a3216b13b4c0480 commit f059a2c832f8cff0d3c0db142a3216b13b4c0480 Author: Jamie Gritton AuthorDate: 2022-03-26 02:16:51 +0000 Commit: Jamie Gritton CommitDate: 2022-03-28 23:41:12 +0000 mfc jail: handle jailsys parameters in modification permission test Avoid a null dereference when a value-less jailsys parameter is passed to "jail -m". There was already code to handle boolean parameters, but in reality any parameter could be passed without a value. PR: 262471 Reported by: jcaplan at blackberry.com (cherry picked from commit 8f1543785f77086494c73310ba8f5d09b61ff7eb) --- usr.sbin/jail/jail.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index eb3b19f2cb82..63096146f176 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -790,7 +790,9 @@ static int rdtun_params(struct cfjail *j, int dofail) { struct jailparam *jp, *rtparams, *rtjp; - int nrt, rval; + const void *jp_value; + size_t jp_valuelen; + int nrt, rval, bool_true; if (j->flags & JF_RDTUN) return 0; @@ -818,15 +820,25 @@ rdtun_params(struct cfjail *j, int dofail) rtjp = rtparams + 1; for (jp = j->jp; rtjp < rtparams + nrt; jp++) { if (JP_RDTUN(jp) && strcmp(jp->jp_name, "jid")) { - if (!((jp->jp_flags & (JP_BOOL | JP_NOBOOL)) && - jp->jp_valuelen == 0 && - *(int *)jp->jp_value) && - !(rtjp->jp_valuelen == jp->jp_valuelen && - !((jp->jp_ctltype & CTLTYPE) == - CTLTYPE_STRING ? strncmp(rtjp->jp_value, - jp->jp_value, jp->jp_valuelen) : - memcmp(rtjp->jp_value, jp->jp_value, - jp->jp_valuelen)))) { + jp_value = jp->jp_value; + jp_valuelen = jp->jp_valuelen; + if (jp_value == NULL && jp_valuelen > 0) { + if (jp->jp_flags & (JP_BOOL | + JP_NOBOOL | JP_JAILSYS)) { + bool_true = 1; + jp_value = &bool_true; + jp_valuelen = sizeof(bool_true); + } else if ((jp->jp_ctltype & CTLTYPE) == + CTLTYPE_STRING) + jp_value = ""; + else + jp_valuelen = 0; + } + if (rtjp->jp_valuelen != jp_valuelen || + (CTLTYPE_STRING ? strncmp(rtjp->jp_value, + jp_value, jp_valuelen) + : memcmp(rtjp->jp_value, jp_value, + jp_valuelen))) { if (dofail) { jail_warnx(j, "%s cannot be " "changed after creation",