From nobody Thu Apr 3 19:32:03 2025 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 4ZTBh42lPxz5sLkl; Thu, 03 Apr 2025 19:32:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTBh40lHQz3S0V; Thu, 03 Apr 2025 19:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708724; 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=dunC5dbTo8yV8wxECdhO4ZypmzfNyv4zd0uhZbpXA7Y=; b=L2pV0BwebwWj6Itq0kZ+ON1z/hYt53Z+tQ9Dj1HpUU4H4SRDA003ckYf5pBf8bcthGUTYP +i6cSYeXzDZBOiA8yNNNTjwbYx3m3jXEiqRr5GMvgNHZXNuCS7G6PJjLhm//EHl3jcmpIW QRqC2Kbc3Gv+I9ymzfmcfuTTJvPRvDOOg/W29D55eghVUuQiMCc0GcbUcVE0SHqKLtbJho kXrDkVcGu37cysH6L4RIJMNmx8jSYDuvzWFrqltW3PQragpq0Tg614d65aSg9Epjao486O iOfszHxzv3mFGzso8Jp/xGe+eHDvy9Y9bRz21BNbVWjg7sLUfhErZMM5iQ34/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708724; a=rsa-sha256; cv=none; b=wNIrBNtPBUVoRf4kmtIfOHLXEqAvPwqsBPs3paDNqZuDLVeNbGYqVDJN5IIN17X5EV6KR1 kwJZGkHbfhp5LDZmf4IJw5Pxoipi4WqPTElrNMaq8wWA1BqDDcLlfp8E+t0faARqTpe2JA 3LOB7sBU1TedYw8KuweaRes51UiPqNb8foZiLl+MiEFlQg0IP8cgq0sLXHl0V6Kp7rrbGh eqSW4Fcrhi5SiUHByDANp4hYHiLh7g+WYT8FiFra1EMmpHcguznCUOTSwV2yxmyDTtji1H 9FmKCV6IERevvBOUx7NfTBK1GFzQrJOzRVpw8gWsDfnL8JGo4PXTbzw21esWvQ== 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=1743708724; 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=dunC5dbTo8yV8wxECdhO4ZypmzfNyv4zd0uhZbpXA7Y=; b=N1v3FM2rzeHJTK2gtkRjimFT/wIqRHqiq894sq+nXEFLEIHabOBHB/MqFb/3zDLCWfbEB5 XmAFzdtHeKcy41sUyf1eVsLlgIJUPrKe7NNyCUzljW06IBqkaNTWfR7AMzmV7kCs1mqT6Q Gl8+NCi2/pBT7I2rAvsJAG6rzGhEuExgIUzoJyBFpq8hF3bNVBAOy1SMv0iuhl37qvhtKn 3CzUbk7+xkzTemMH/fpLiSwC64haZ8yd3fCCqsOISrdAMS7IWLkTuylY70TVgltMmuidHL Na0fpd+lNgfEDxOek2DfaKEzCRRgJJHpaq8H8L5M5fouPlCva/RsmbTGKK009w== 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 4ZTBh40LNGzXL; Thu, 03 Apr 2025 19:32:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 533JW3KR037432; Thu, 3 Apr 2025 19:32:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JW3wd037429; Thu, 3 Apr 2025 19:32:03 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:03 GMT Message-Id: <202504031932.533JW3wd037429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 37a72b0ce427 - stable/14 - MAC/do: sysctl_rules(): Set the requesting's thread's jail's rules 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 37a72b0ce4276ba9da54210638d714444c0e8100 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=37a72b0ce4276ba9da54210638d714444c0e8100 commit 37a72b0ce4276ba9da54210638d714444c0e8100 Author: Olivier Certner AuthorDate: 2024-07-03 12:59:12 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:30:58 +0000 MAC/do: sysctl_rules(): Set the requesting's thread's jail's rules Allowing to change the rules specification on a jail other than the requesting's thread one is a security issue, as it will immediately apply to the jail we inherited from and all its other descendants that inherit from it. With this change, setting the 'mdo_rules' sysctl in a jail forces that jail to no more inherit from its parent. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47601 (cherry picked from commit 53d2e0d4854997005271ee60791ab114bd6e0099) --- sys/security/mac_do/mac_do.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 94fe7b99fc9d..98bace7052f6 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -310,11 +310,12 @@ static int sysctl_rules(SYSCTL_HANDLER_ARGS) { char *const buf = malloc(MAC_RULE_STRING_LEN, M_DO, M_WAITOK); + struct prison *const td_pr = req->td->td_ucred->cr_prison; struct prison *pr; struct rules *rules; int error; - rules = find_rules(req->td->td_ucred->cr_prison, &pr); + rules = find_rules(td_pr, &pr); strlcpy(buf, rules->string, MAC_RULE_STRING_LEN); prison_unlock(pr); @@ -322,7 +323,8 @@ sysctl_rules(SYSCTL_HANDLER_ARGS) if (error != 0 || req->newptr == NULL) goto out; - error = parse_and_set_rules(pr, buf); + /* Set our prison's rules, not that of the jail we inherited from. */ + error = parse_and_set_rules(td_pr, buf); out: free(buf, M_DO); return (error);