From nobody Thu Apr 3 19:32:06 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 4ZTBh65wvfz5sM15; Thu, 03 Apr 2025 19:32:06 +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 4ZTBh62KBsz3S9n; Thu, 03 Apr 2025 19:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708726; 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=ntcj8PUveMCjXHTLcqO7VJyZX/rz4bbrbyUxZujAAPU=; b=SHvBxt4YM3I434bO4oG5qRL5zYuczd1JpArrYYbbON6ds8qKDCMrKpF1iybdGYnJb4ACio s7VY/2LlfpjmgHR31Sif54R8QldposRLSdQEIGx9XOtRAKqL5EaAhpX+xSoHNbf4joRk3Z kSjkwdIcNzrWA4qBbUuTnXa3eYduFxjgQqa0/BbsB/agLOmUYRWxuQVljjql8R1+IAeQ85 8mIKzCVMnnHyNgJYgPJ21nCPoT8ZYJraWAZVMY8o3q8sgQpD+5/mPV5zHgKIp0KMaAIyob Y4tbEzqJIlOTFWt+YQ+EJLdccHwHM91aQUhtQ8e5zt5cInehCNOLU7P6SJtRbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708726; a=rsa-sha256; cv=none; b=XDCl9kvZhpMk1k5jr27IHk48qabNQ2hvKPC6mxYtra0QRxkRsgKpMoK8xb89u8yS9JDUyj 0BfFl5g5BVb4Zm/EdGzaVr5A52yi3e2RlIoB/GTvgwN+R630vgZFche9Okz/Nbi6C1m8ol VHZsZkJqp/zfoxvPQBi5LUOiyOZwjrCUm/iQQ/nsd/rdmvK93szVpNFjyFGXHTyyESpfi1 rhKZvc3Dn7X51lHBFvl7VnHMnsrLUKMcM5GJl4eql7XFIzXGlYb+nocQI7A+MXIWStmUqx 7Vqn8nMN8otk5N6lsE5YV/Ts66iO9moqPoR/5MxEZ3mWf90EwXVVsPf0DfCUdw== 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=1743708726; 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=ntcj8PUveMCjXHTLcqO7VJyZX/rz4bbrbyUxZujAAPU=; b=Ta5qKLf0hjFnwzA5kBmpzJMB8O0ptbx6h17pAw+j61CojBMtRwcptAzHDK3c4kqJ2WjB/D 7dhtNMDzkMVB25q8WqVyMBhVYkh8l5MZ055mM+FvkLCq+qyymajReCN2KeAb+Y33GAa0vJ MwvmoSv5J8cO6dU6fVc4xzJiGb4ow4E4vWQzpF+LJTUMDGY5LE3CH7dtwKYZmt8mrlmcY7 l6vYeAOGAtavGGB43ptT7x3YMmj9yRrHyNUkU1BiKKYjoDpbuAzHnNVblEZlGW3z2Z5H/T ULQTAClhj7DOLAUusdy3SkuPCT3ePnRdD9lrqiID3vLfKA1NCucLG0tmeS0kOQ== 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 4ZTBh61r7fzXM; Thu, 03 Apr 2025 19:32:06 +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 533JW6PG038369; Thu, 3 Apr 2025 19:32:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JW61D038353; Thu, 3 Apr 2025 19:32:06 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:06 GMT Message-Id: <202504031932.533JW61D038353@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: ae2ee5470d9d - stable/14 - MAC/do: Remove the 'prison0' special cases in the common paths 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: ae2ee5470d9d0630d8f03c3ea4e4b2852a33d055 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ae2ee5470d9d0630d8f03c3ea4e4b2852a33d055 commit ae2ee5470d9d0630d8f03c3ea4e4b2852a33d055 Author: Olivier Certner AuthorDate: 2024-07-03 13:23:26 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:30:59 +0000 MAC/do: Remove the 'prison0' special cases in the common paths The rules on 'prison0' are initialized in init(), now using set_empty_rules(). Until the jail is destroyed, they can never be uninitialized by a call to osd_jail_del(), since the only chain to call it is mac_do_prison_set() -> remove_rules() -> osd_jail_del(), and mac_do_prison_set() (method PR_METHOD_SET) can never be called on 'prison0'. This guarantees that find_rules() always find a valid 'rules' pointer to return. There's no need to do anything special in destroy() for 'prison0', as osd_jail_deregister() now takes care of it. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47603 (cherry picked from commit beb5603c51e0323e267ceff8f83b3c95151f0822) --- sys/security/mac_do/mac_do.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 787790cb2b34..8ce84d7ba099 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -58,8 +58,6 @@ struct rules { TAILQ_HEAD(rulehead, rule) head; }; -static struct rules *rules0; - static void toast_rules(struct rules *const rules) { @@ -204,19 +202,20 @@ out: static struct rules * find_rules(struct prison *const pr, struct prison **const aprp) { - struct prison *cpr; + struct prison *cpr, *ppr; struct rules *rules; - for (cpr = pr;; cpr = cpr->pr_parent) { + cpr = pr; + for (;;) { prison_lock(cpr); - if (cpr == &prison0) { - rules = rules0; - break; - } rules = osd_jail_get(cpr, mac_do_osd_jail_slot); if (rules != NULL) break; prison_unlock(cpr); + + ppr = cpr->pr_parent; + MPASS(ppr != NULL); /* prison0 always has rules. */ + cpr = ppr; } *aprp = cpr; @@ -265,13 +264,8 @@ set_rules(struct prison *const pr, struct rules *const rules) rsv = osd_reserve(mac_do_osd_jail_slot); prison_lock(pr); - if (pr == &prison0) { - old_rules = rules0; - rules0 = rules; - } else { - old_rules = osd_jail_get(pr, mac_do_osd_jail_slot); - osd_jail_set_reserved(pr, mac_do_osd_jail_slot, rsv, rules); - } + old_rules = osd_jail_get(pr, mac_do_osd_jail_slot); + osd_jail_set_reserved(pr, mac_do_osd_jail_slot, rsv, rules); prison_unlock(pr); if (old_rules != NULL) toast_rules(old_rules); @@ -339,7 +333,6 @@ static void destroy(struct mac_policy_conf *mpc) { osd_jail_deregister(mac_do_osd_jail_slot); - toast_rules(rules0); } static int @@ -452,7 +445,7 @@ init(struct mac_policy_conf *mpc) struct prison *pr; mac_do_osd_jail_slot = osd_jail_register(dealloc_osd, osd_methods); - rules0 = alloc_rules(); + set_empty_rules(&prison0); sx_slock(&allprison_lock); TAILQ_FOREACH(pr, &allprison, pr_list) set_empty_rules(pr);