From nobody Mon Dec 16 14:45:46 2024 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 4YBjRZ6tmcz5hWP2; Mon, 16 Dec 2024 14:45:46 +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 4YBjRZ50Wbz4dGr; Mon, 16 Dec 2024 14:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734360346; 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=nsXfM0QvCely/vx2TP+84lHCLr5H7t1nRqPUgBEwH98=; b=fCXqyEB7qQ3Ve+7FeM+jLkaGmlFZiJERDQKRzx9Fr3xNE32ULttuIipvQtf+8cXFSzLJaD hLE4EOVfgkjEs++4HJOJZCic7KBCWCOcE8qmsjgBFhdzf63HsFsXymiqp6kOHuCKmNxJYq RMkoRdFZkn63ij3EVHyoI11UHjIy6TvLpSb6ps+fHPnhy/mqPv9OQmaJCAe7TeZR1vREVo 3m7SwLvcJyzv9It64NcZwGaCub1NEVWXnHDtG2mDBN6+NhkGXfM/Lfs72eeq4/j1hGlcLM 3c6mzYmf20pZ/kTTsvAvcxCdBZmE9vEC3K00Xfrsl7ZybavoBMOiUcKy3nDbgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734360346; 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=nsXfM0QvCely/vx2TP+84lHCLr5H7t1nRqPUgBEwH98=; b=tiY9iXuQQyMba1rcTj2GP7yYg+qZMYPboxO/d4ucryPzLY8O2Yx/vcUfwZufx0DxON6tc6 fVI5GvfxHLeerjxCwIxH8MMURaeQcLc1u4aq8VeM4eBbaPIak+3f0ai/KguX/n9xyekbds vT9hxT2XKbZB1YaUL2RO2gbW9/tXv7uXDbnC3/NLW/IiZtf+LZVnRzzjRUvOWXPYlJUd9f QzwwxLd99Ky9Yj8Rh+zJLcfyQLOZfdvb1f2dTpoGXjijZ5HJfVxMfhnxx/jUiiYfR/EbH0 6nygSMCUu8N1JfG8T7VVcDxcMkzXhU6P+dOgyZb0oZMJDq/AXLdg0lUm24k1Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734360346; a=rsa-sha256; cv=none; b=CX7Nq9GZCb4RApQeAGGSA7FXGerzW1BhfJ5hY+17IzVNKoCpr4b46DDs0KcZV4gctxiL4Y 30T3t6WkWxcz1vZOlhLKol/aiX9aK+z/VBYrRBLQtbW3KKilUPXmy1pSv5b1Rr+pfemmvH 7S8v59MBOSMd+Z03p6VForPmH5OCZPcaH6AVzimEsjhsNbKcqRdAxYzk4gRdNgPbbbIV9c hLyKqtufitUxs17km8ArnlRdjDGrpQyEgcEO3d+bhQfUYSX2+1wQEQVZmkafsup8PD5UNr 83XUmCVGqqo59Qk3u510Aboivnxq1NEs+MACmglpHjjqN+UmVUIA2dyK7TFPbw== 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 4YBjRZ4ZZ6zxWt; Mon, 16 Dec 2024 14:45:46 +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 4BGEjk9a052849; Mon, 16 Dec 2024 14:45:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGEjkBF052846; Mon, 16 Dec 2024 14:45:46 GMT (envelope-from git) Date: Mon, 16 Dec 2024 14:45:46 GMT Message-Id: <202412161445.4BGEjkBF052846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 301eeb10dc19 - main - MAC/do: Remove PR_METHOD_REMOVE method 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 301eeb10dc197986b2b6261b064cbfe96333f7fb Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=301eeb10dc197986b2b6261b064cbfe96333f7fb commit 301eeb10dc197986b2b6261b064cbfe96333f7fb Author: Olivier Certner AuthorDate: 2024-07-03 12:22:35 +0000 Commit: Olivier Certner CommitDate: 2024-12-16 14:42:34 +0000 MAC/do: Remove PR_METHOD_REMOVE method It isn't really needed, since common jail code destroys jail OSD storage at jail destruction (via osd_jail_exit()), triggering our destructor dealloc_osd(). Leveraging this mechanism is arguably even better as it causes deallocation to always happen without the 'allprison_lock' lock. While here, make the static definition of 'methods' top-level, renaming it to 'osd_methods'. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47599 --- sys/security/mac_do/mac_do.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 3f7964220ca4..ed4c984ff559 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -410,15 +410,6 @@ mac_do_prison_create(void *obj, void *data __unused) return (0); } -static int -mac_do_prison_remove(void *obj, void *data __unused) -{ - struct prison *pr = obj; - - remove_rules(pr); - return (0); -} - static int mac_do_prison_check(void *obj, void *data) { @@ -447,19 +438,26 @@ mac_do_prison_check(void *obj, void *data) return (error); } +/* + * OSD jail methods. + * + * There is no PR_METHOD_REMOVE, as OSD storage is destroyed by the common jail + * code (see prison_cleanup()), which triggers a run of our dealloc_osd() + * destructor. + */ +static const osd_method_t osd_methods[PR_MAXMETHOD] = { + [PR_METHOD_CREATE] = mac_do_prison_create, + [PR_METHOD_GET] = mac_do_prison_get, + [PR_METHOD_SET] = mac_do_prison_set, + [PR_METHOD_CHECK] = mac_do_prison_check, +}; + static void init(struct mac_policy_conf *mpc) { - static osd_method_t methods[PR_MAXMETHOD] = { - [PR_METHOD_CREATE] = mac_do_prison_create, - [PR_METHOD_GET] = mac_do_prison_get, - [PR_METHOD_SET] = mac_do_prison_set, - [PR_METHOD_CHECK] = mac_do_prison_check, - [PR_METHOD_REMOVE] = mac_do_prison_remove, - }; struct prison *pr; - mac_do_osd_jail_slot = osd_jail_register(dealloc_osd, methods); + mac_do_osd_jail_slot = osd_jail_register(dealloc_osd, osd_methods); rules0 = alloc_rules(); sx_slock(&allprison_lock); TAILQ_FOREACH(pr, &allprison, pr_list)