From nobody Tue Mar 24 18:12:53 2026 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 4fgJ6t0SYdz6W0D2 for ; Tue, 24 Mar 2026 18:12:54 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fgJ6s6xVmz3v1k for ; Tue, 24 Mar 2026 18:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774375974; 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=ywUDdkcfFvN895y3IVhZDLqz4nenvGHFVuW5IJ1j0A0=; b=g8M1/rRil8JoSHFCNMIAOrCpeccfi2mLEcEoOhHzcbcRpGhRR/4fXDv3uZfQGjr6peyRoo RZzTbEYs95cNRLySAz6psT/H8YQ6ttAWvsWD7wWh0UrGywRY+cqvJnrgVLALQWdybQeEe3 wFn4XD4gAN7MnkAU065hnBKHLNj59Onbh3uNYNdrlZ6W7N4Tnxe0bFPF2iCS1QIhCMnwvl 3Vzhio4tkvMo6kjV/5tSHP5m30M4hxrVcxANnPXfpV6qz9W22KSQz0sADnBOjc2H7wrJSa 14nW4Mm1NKAZA+udB5GRSq2QP7rk+PaBQoSB56b9ho2uIGC0detV1sSIEvfEcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774375974; a=rsa-sha256; cv=none; b=ZBy458Sjnk6j66MWr3xdWh3a+kA0KXFikT56nUiRd3ISl3OfexYVCQoAjZsALGPGBlZv1O SW4nEOWEFkWqeHABLQyvoaR9enPXpoYBYrypVkKLeqDIcMxLpr+mlG4EL1VlMEjz0FP/p7 esHDxhS3U3yznYTS2JSM6y83JhUZtoS9o5MyMoDaQSlUr2SIC57L1ezs1lnW6iiwQwryvA F+VtefKiYOI0U56HVjfiup8yNg9pEpRqY11ONOVTNm16wrt1Dxemr0Z1AFvAIlHzI8O4EX ughpZsqzOPi/sNdYHZIUQYXIp9XYz8gOpfdCZT3+U1aM36dOZrylg+13y8qvJw== 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=1774375974; 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=ywUDdkcfFvN895y3IVhZDLqz4nenvGHFVuW5IJ1j0A0=; b=aWCTJcK7pvw7PeIZaXuDRjrHiOA0Q9eneV3IGzSsZAxcT5Ke9RKgoebjUUBmXE2i514s3a 1NRf9xREKb5/buhEB8JQfPX2um/5PBfVt1guLSeGHpTiZD6tZluczL7v3AO/TVn2BpWl5/ fNqwtvJaltcPUlZdrG1olip6Lr9mxzDUlBF351HJh5noemXG5RDi4Y9TU8ht3pmHx1aMKf YZf3LugPGuGmHuM2pDZVSZsoXXEbaiJPeXPP538N5yzcQQ3TK9I6NUAfqTOwlCj7M9S75c o/0vZof8I41NcyFYkXQJQtQSslg150AQebmDuBDyLS24J9ngzBTTNJ16a0ADAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgJ6s6VP2zTd6 for ; Tue, 24 Mar 2026 18:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cafe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Mar 2026 18:12:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 954aaf3958e2 - main - MAC/do: Comments: Rephrase one, fix a typo in another 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: 954aaf3958e2ea0e9b1811090ddbb9d8b13a3e5a Auto-Submitted: auto-generated Date: Tue, 24 Mar 2026 18:12:53 +0000 Message-Id: <69c2d425.3cafe.230d2a68@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=954aaf3958e2ea0e9b1811090ddbb9d8b13a3e5a commit 954aaf3958e2ea0e9b1811090ddbb9d8b13a3e5a Author: Olivier Certner AuthorDate: 2026-03-21 13:39:04 +0000 Commit: Olivier Certner CommitDate: 2026-03-21 13:39:04 +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 --- 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