From nobody Thu Dec 15 00:50:25 2022 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 4NXYYZ0L5Qz4l1XB; Thu, 15 Dec 2022 00:50:26 +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 4NXYYY6jjrz3LfN; Thu, 15 Dec 2022 00:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671065425; 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=ltQKLS3E15Ohle2WObPRJ57SLrjlzzDHel2lcDSLReQ=; b=R4Q7BL6KjG6n5qrjqqj4FwUebv8iPxjORYen+ePtXoRwtnqYH9eQB+8K0RBB8aNnDQhd5O lAmRj/DWmUSDHnhNhvZi/9Bnq7CcfU7j6iKpFdmaMwnXlAeex2bO3dISaZQUl3sU84Of0S 8EJgqwxmKsE0BmYHQLb14jUsk3nzFPhz/cYGTRYXoRK5KliG2GgAHc5DP38HuniXMS+hLN 5e+O9jOiX6QYRvvdZHTHnFfh6hZ3ciLwr+Brm61RtWvi5EBEnQxSFX6g3UPsLg/d0S3hbf Ft5LWZnLtnED4/MzdbnwjSiLRiNvy1S4EvrKSYC0fOaxbutbuRwx34A5W5AFcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671065425; 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=ltQKLS3E15Ohle2WObPRJ57SLrjlzzDHel2lcDSLReQ=; b=Y7DpB1JDqDWdaeIFq3TMMOK8T4zZTRHRELS66qB3/YLmmlcfefpdhH0FwFvZJY8ICnzheh qoZMoFw5P9Ga3N6J5Jpxc/iVT24WJVrRfwOk3XKQtgzhH8YON2ScR2ohKbJGBHYrs+ZTt+ AcGkExoFRtvsuwKRVBgeITv/DfGPvriv/zBPYEP0i5dM5PDw/wX8KnIOyzs7cHfdYNXP1x JRcM1+XCyMCojr/ButottphQh/h8WU23WABOAYgaowvMCTJSyUZWGeIXBEa7E+QeolUXRG PGUeUj96U+cVy2hiOAeOfMtninDBS4LCjFdRGjAjNZTgod8TqghU6pc29nsRFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671065425; a=rsa-sha256; cv=none; b=CkpO6PQdp2Oq0SSi3R6pAy/O0tONk+XyJE+dDUqy8Hw1dLx5oi7VJjG65tdkyUuw+Hex3F ptcbQIHNPUFo2OIeDUY1qcbZFGlviMScEvNcXssh6GLKx3h50pcS0C2fPbEaZaKHRPPngZ Z08aBFkn0pXb42Hp8Zh+rnh5pxuiFYAA/zMzGP1plyez1xDzOEmsEJgNZykw/N3JVLCZxK gVaaQGysWmv5sKqEGOe9/9rSE1cN0UTOwnSlrknWofCENvZszRTrY9INOQ954I3QQnmMNs Ih9Sbk0071Wqsf3kCTJjemXp2NWoPUTna8IWv7Yz8zboTV6Ob4Y03eYGcNTleg== 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 4NXYYY5WgKzF7s; Thu, 15 Dec 2022 00:50:25 +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 2BF0oPun075567; Thu, 15 Dec 2022 00:50:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BF0oPHv075566; Thu, 15 Dec 2022 00:50:25 GMT (envelope-from git) Date: Thu, 15 Dec 2022 00:50:25 GMT Message-Id: <202212150050.2BF0oPHv075566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: e8d7ae918a10 - main - jail: fix a NULL pointer derefence in parsing ip6.addr settings. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e8d7ae918a105f252cf06249787d82f43e023ba8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=e8d7ae918a105f252cf06249787d82f43e023ba8 commit e8d7ae918a105f252cf06249787d82f43e023ba8 Author: Jamie Gritton AuthorDate: 2022-12-15 00:47:55 +0000 Commit: Jamie Gritton CommitDate: 2022-12-15 00:47:55 +0000 jail: fix a NULL pointer derefence in parsing ip6.addr settings. This is the counterpart to bd24e861b4ef, which did the same for ip4. PR: 268377 Reported by: ahkithaama at proton.me --- usr.sbin/jail/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c index c1d418d6cc69..6b23af25b01c 100644 --- a/usr.sbin/jail/command.c +++ b/usr.sbin/jail/command.c @@ -440,7 +440,7 @@ run_command(struct cfjail *j) } else argc = 4; - if (!down) { + if (!down && extrap != NULL) { for (cs = strtok(extrap, " "); cs; cs = strtok(NULL, " ")) { size_t len = strlen(cs) + 1;