From nobody Thu Apr 3 19:31:58 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 4ZTBgz4lMDz5sLmY; Thu, 03 Apr 2025 19:31:59 +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 4ZTBgy3xPnz3S62; Thu, 03 Apr 2025 19:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708718; 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=hBwnXaTP91AWbYxYKGooUHQ27We8yWFD3FjUmFIZZqA=; b=siTSYJRjCZzI/N3ULWOBNMRdpl4gI1hY5T4HZoZ2xvYqYcfX1bY5podgnVB0G3XwFGHc1g Yf6XXx7y9wmdH8EAJa+qyPm+oOa0afPcVej1OgGMcS+sW2T1ferK9PX5TZ9gwxDOJAhSBL 3oYqDivzo6OU217UW+1u7lOQTsAf2WB7FIksBA54ZiLkAIOX1aJctj+ZHodHWLT4cveUTg BwVgiCB3vT+H1JasnCUeS/5DheJBc7dCCIGwx3xArX0WIyaxbev7A9TylrJDunGLi8RVsY q83lSbKddiDGgrgaReieGn4THpnlZ1OAiNlKrqhdH9zat/R3Hy9YeNIHmU42lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708718; a=rsa-sha256; cv=none; b=ZfMbG9zT0hGNXx+YonvoZ6FE720r9rq9ZQAx/9RQ3pVjULxG15/WzCqPJ0cBiUD5RfZdZU RWB1cg5+WQUwd/dAx3+4Q1oMfBtnCEIzfBe/fCDhTJgjUTVIFZZIK4znmA4Pok+4/V+A/N PP7O6w8LV9vumU/v6EuZQLK2Zw2SbVqDkPvzoquW9ONIODcbrdcNyNxrcMIkzUWPJmYoEa NoQtZQWU6jPZnDnJfOS+CSaIm2GGtZV3YbZPdRBu3OAeGDkylvHbF8jLQS+dbOwKj2KBmy ER6P9ZfDtj7tCLZQRTfhcryTDyaMcLaBXD0p6W1AKqrFawQW53K/AX2i/5Re8g== 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=1743708718; 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=hBwnXaTP91AWbYxYKGooUHQ27We8yWFD3FjUmFIZZqA=; b=Yy68Sn7xRhj/Vs2zHr5PbFr709QIstAl0LTqMao9vW1gyHq/Ky0HSZ0xlUYur+oWCI1uf0 Q2VRLcxdbRMcwgW3o78tvTNuudXXjSH2Jx82z9qFTqY4/HxqZ34fNA/iLoU6GbR3qLpzlM c4MaMFS/q4zPSnXIk8BCsJ/tPqVFHo6dlpjdMrDXxGIxUjP118AYOhlCaQij08hhcKGpOF Uf/zo+9UTFO3KpPx1ZO7mbVws4z7Z99/mQbOt0pHNUu/hASdMWCmI2LP85/aA1PyKhS6AJ 6eMmzWFhNTy6x1bntnJWj8D3yPPO86KweIC2MoJm7v1piTX6TzSQYSnFzvzaLA== 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 4ZTBgy3S65zmq; Thu, 03 Apr 2025 19:31:58 +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 533JVwoa034000; Thu, 3 Apr 2025 19:31:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JVwxj033997; Thu, 3 Apr 2025 19:31:58 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:31:58 GMT Message-Id: <202504031931.533JVwxj033997@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: 9b6284bda25a - stable/14 - MAC/do: find_rules(): Clarify the contract 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: 9b6284bda25ad0921ad2c0a72f759e542831f251 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9b6284bda25ad0921ad2c0a72f759e542831f251 commit 9b6284bda25ad0921ad2c0a72f759e542831f251 Author: Olivier Certner AuthorDate: 2024-07-03 13:11:12 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:30:57 +0000 MAC/do: find_rules(): Clarify the contract While here, rename an internal variable. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47596 (cherry picked from commit b2c661fe7e0b0dff859767a6a8714198b38dc235) --- sys/security/mac_do/mac_do.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index ce4ab7fa9e3a..dca5a1809966 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -153,24 +153,32 @@ out: return (error); } +/* + * Find rules applicable to the passed prison. + * + * Returns the applicable rules (and never NULL). 'pr' must be unlocked. + * 'aprp' is set to the (ancestor) prison holding these, and it must be unlocked + * once the caller is done accessing the rules. '*aprp' is equal to 'pr' if and + * only if the current jail has its own set of rules. + */ static struct rules * -find_rules(struct prison *spr, struct prison **prp) +find_rules(struct prison *const pr, struct prison **const aprp) { - struct prison *pr; + struct prison *cpr; struct rules *rules; - for (pr = spr;; pr = pr->pr_parent) { - prison_lock(pr); - if (pr == &prison0) { + for (cpr = pr;; cpr = cpr->pr_parent) { + prison_lock(cpr); + if (cpr == &prison0) { rules = &rules0; break; } - rules = osd_jail_get(pr, mac_do_osd_jail_slot); + rules = osd_jail_get(cpr, mac_do_osd_jail_slot); if (rules != NULL) break; - prison_unlock(pr); + prison_unlock(cpr); } - *prp = pr; + *aprp = cpr; return (rules); }