From nobody Tue Feb 21 15:51:36 2023 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 4PLkL037zwz3spFH; Tue, 21 Feb 2023 15:51:36 +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 4PLkL02fRnz3H23; Tue, 21 Feb 2023 15:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676994696; 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=HW33LUVpEz1j5Nz2M24Tmi8tjGIt/eazdf5n5LxDlqU=; b=wxaAfXMDNEbmNN4OyGdhV2VZlmMr+yX4EItOjB4Fd8qNEC7/GL119pdPuutiCNj5mfar3G AzVxQeKAlEMDrQjw6KMr7AaceVMsmlrHm6/HE54LG+64/+l+L0eGlu+07ywwZL0Xyj6RDz WVmYQH/sINFCyBZECPfHo11BHcB/A9cfZ701DeDjdmEcMpCWghK6eRLFeRiqHtN+4mDDfz q14h7L3c10dn93pslAMxK8o70MiJqhAr0is3Paj29VcsEEG+s2mR1OS+3KTDe0nQjLaZ3h 0RA2/+b6OgWwzEP0eTUOZagPulsmbWaimveXSAMQfjEnCqftRGcIS8Y6JQbK6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676994696; 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=HW33LUVpEz1j5Nz2M24Tmi8tjGIt/eazdf5n5LxDlqU=; b=enVHok2ZzISg+8zXr9VfRyoWyNW2fc038CVsiffAmCQ6HSkrjWnWzn8Jws6J2vrRw6R0Rb vSq5NxFn0NCY4WY6vMeSPzYDQcnjRHbFwPLqvpNpzNN4Wf9+UqOHg+WiBwPyrMDObN2eeW aG0DkEEJbEQv9C+5u/5RGtq6vUoubR/wBZLatY+BRVuBDgzrMmqBhI+qkw/OR2JWVtCCvp sohi9pagBEd43SupcfwK+SF6i/tYjKXg9tw6DcGrIJArqyMpRV6931xHcZ4Pb9YfkorvpZ oYAOTk4zH/UcXdgJmh+3z+l7Wze9ex/7MbzitZ3nZGSEFIUgH2ESVBiluPck6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676994696; a=rsa-sha256; cv=none; b=eCI4KR/mZzaqROq6XVwVk1Wv0DVrmkNMy3NddK6wklSRWH1LOfwvoQVubL6DVeDnYbwj1k rh4B0CZRqBA4e4D89xeFcZUHQeK0aRMl9Rd4xCF1v1OAiF3STStaMH3a/60pX1opjupCC0 2xybXzdjSu5zZ3wi3RJHh6Mqh7Bpw4HMk405P/M3Cl0ujyRS1TPFkq3ZebAqAE45uFUoIV sCEbJbFvOXjXxzZyFaZ6AyFPYZ6EjN0dUrQDKWZZcMAM7ZhZgmc3G++zmtroDpR+Qjgg18 2C9bPbYmG31Ik7tCLym+6hDksx1oil7Eo2vlVTz5Yg/uVJvEM3YB9M3FWgmaLQ== 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 4PLkL01lHWzRGH; Tue, 21 Feb 2023 15:51:36 +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 31LFpaRk073691; Tue, 21 Feb 2023 15:51:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31LFpa3c073690; Tue, 21 Feb 2023 15:51:36 GMT (envelope-from git) Date: Tue, 21 Feb 2023 15:51:36 GMT Message-Id: <202302211551.31LFpa3c073690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: b2d76b52fd48 - main - jail: Fix redoing ip restricting 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2d76b52fd48306486deff193d49b728afbb04a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=b2d76b52fd48306486deff193d49b728afbb04a3 commit b2d76b52fd48306486deff193d49b728afbb04a3 Author: Zhenlei Huang AuthorDate: 2023-02-21 15:43:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-02-21 15:43:25 +0000 jail: Fix redoing ip restricting `prison_ip_restrict()` is called in loop FOREACH_PRISON_DESCENDANT_LOCKED. While under low memory, it is still possible that in subsequent rounds `prison_ip_restrict()` succeed and `redo_ip[46]` flip over from true to false, thus leave some prisons's IPv[46] addresses unrestricted. Reviewed by: jamie Fixes: 8bce8d28abe6 jail: Avoid multipurpose return value of function prison_ip_restrict() Differential Revision: https://reviews.freebsd.org/D38697 --- sys/kern/kern_jail.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 75be0df85448..92e8e4f34b42 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2047,7 +2047,8 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) continue; } #endif - redo_ip4 = !prison_ip_restrict(tpr, PR_INET, &ip4); + if (!prison_ip_restrict(tpr, PR_INET, &ip4)) + redo_ip4 = true; } mtx_unlock(&pr->pr_mtx); } @@ -2066,7 +2067,8 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags) continue; } #endif - redo_ip6 = !prison_ip_restrict(tpr, PR_INET6, &ip6); + if (!prison_ip_restrict(tpr, PR_INET6, &ip6)) + redo_ip6 = true; } mtx_unlock(&pr->pr_mtx); }