Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Jul 2026 10:00:42 +0000
From:      Olivier Certner <olce@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 045b82909cb3 - stable/14 - MAC/do: Comments: Rephrase one, fix a typo in another
Message-ID:  <6a61e64a.3be30.44c2ed42@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/14 has been updated by olce:

URL: https://cgit.FreeBSD.org/src/commit/?id=045b82909cb3c9cb982dc110d72217a42560e299

commit 045b82909cb3c9cb982dc110d72217a42560e299
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2026-03-21 13:39:04 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
CommitDate: 2026-07-23 09:59:05 +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 1006d4eae916..338170a0319b 100644
--- a/sys/security/mac_do/mac_do.c
+++ b/sys/security/mac_do/mac_do.c
@@ -1154,13 +1154,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


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a61e64a.3be30.44c2ed42>