git: 806d26e169ee - stable/15 - MAC/do: Comments: Rephrase one, fix a typo in another
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 30 Mar 2026 09:36:33 UTC
The branch stable/15 has been updated by olce:
URL: https://cgit.FreeBSD.org/src/commit/?id=806d26e169eea1a8eb445a65c1a883fa191122e8
commit 806d26e169eea1a8eb445a65c1a883fa191122e8
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2026-03-21 13:39:04 +0000
Commit: Olivier Certner <olce@FreeBSD.org>
CommitDate: 2026-03-30 09:36:07 +0000
MAC/do: Comments: Rephrase one, fix a typo in another
No functional change.
MFC after: 3 days
Event: AsiaBSDCon 2026
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 954aaf3958e2ea0e9b1811090ddbb9d8b13a3e5a)
---
sys/security/mac_do/mac_do.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c
index 2bcff7bba973..ba49da22ce67 100644
--- a/sys/security/mac_do/mac_do.c
+++ b/sys/security/mac_do/mac_do.c
@@ -1153,13 +1153,14 @@ remove_rules(struct prison *const pr)
prison_lock(pr);
/*
- * We go to the burden of extracting rules first instead of just letting
- * osd_jail_del() calling dealloc_jail_osd() as we want to decrement
- * their use count, and possibly free them, outside of the prison lock.
+ * We burden ourselves with extracting rules first instead of just
+ * letting osd_jail_del() call dealloc_jail_osd() as we want to
+ * decrement their use count, and possibly free them, outside of the
+ * prison lock.
*/
old_rules = osd_jail_get(pr, osd_jail_slot);
error = osd_jail_set(pr, osd_jail_slot, NULL);
- /* osd_set() never fails nor allocate memory when 'value' is NULL. */
+ /* osd_set() never allocates memory when 'value' is NULL, nor fails. */
MPASS(error == 0);
/*
* This completely frees the OSD slot, but doesn't call the destructor