From nobody Mon Mar 30 09:36:33 2026 X-Original-To: dev-commits-src-branches@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 4fkmNK6VcHz6Wj0h for ; Mon, 30 Mar 2026 09:36:33 +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 4fkmNK5X16z3Ht9 for ; Mon, 30 Mar 2026 09:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774863393; 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=zBuYVBGkC4x8c7tR8gzcAsPSW3mvMZs+sR8iLEZ3OPM=; b=DnfH0KEKADXHcZzUM8rK/Q2P1rkKHq9Glpc81zZVogGdCkjMFS4mmcms3odNEssM2qLvCy xwmBfCaHlqcERpEG970HaXjgcQ9cNa9asv1MxMuCBfqLLqMHHzhTR62gD/l0Kscdt2HDqD dlHVpjCeIoDDWHho/bDRnpJabegF+GLMg/3A8fHkhGKv628O+Bfl3xHfnbmRwtC1i1uaA2 JRwn7dHx43Z2FUkZpf6VlvWwqyIdqj+Pl3eIjxUu6oXOWuzqQ7LDnZkqyhdwpDGbi3OOKg kWjFWMVRRLLozS/l0ZifqQFZCMxRxuV0PzvieveLBYh47Lmqr7WtmWTLLfqAIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774863393; a=rsa-sha256; cv=none; b=K5z4LewJ2DALf+DJTkAcIOZkZAgqjOBAr2cCPPVVX+yMHl+H72MI31trojHqV0qbb6wkuM exuqMKNrxsujobroNxNptZWTYGariUA1ZMS6lPCsr/wop+RR8REBgAjNhTrK5mq6V0x7TH SAQnFXs7eZwD4b6tNKxFM8G4ZqPkjA2cAIVwEJSCFCsEK44zUnZID+EBdrzJQPUSaqm56+ 1BZPlcB29p6H0QVw4Va9yero57h58SpxUVxjeEjJLYbkZI/NnhJqUjUJiVyE02pJxiRQZ6 KTuSwMnzXeFQkY6Lj2nDpokBOzSCNlxyzVNUYmpNe3znK/iKkvyxlfEJTOM3ig== 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=1774863393; 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=zBuYVBGkC4x8c7tR8gzcAsPSW3mvMZs+sR8iLEZ3OPM=; b=wuZ2+9i4ds5wkXPRkZCF+Hlt6/G3g3OSV5sf5zqLTeqJQfkai6EoSvkDxG5kFakjqqBvKi XkOLHgPLhgeDunxxzoAIOdtKMlg02ViRHLDk48HRm15iGbUQLVIoq/5wSj+z5zYPYsfUvS nqRQZ3xER7ZhiWdwmy+TGutvLn9Rk6vWcNV35q9x3oxEpt8uswqRYG46yHYZ6gv/cjioEj WhqEUB7rVlK2KQLlLkirGbNYfwuMVC33OIzxVIGZk/RG2WKIP8lK3jeZB79vDlrrK8SJ34 qsJUJJWf0jLCxRGb846+vqO921hfW0LesjRfV2mVsyt35g3uXoIluXYXdf/7Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fkmNK4s1VzdQ4 for ; Mon, 30 Mar 2026 09:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27ab6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 09:36:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 806d26e169ee - stable/15 - MAC/do: Comments: Rephrase one, fix a typo in another List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: 806d26e169eea1a8eb445a65c1a883fa191122e8 Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 09:36:33 +0000 Message-Id: <69ca4421.27ab6.67ede271@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=806d26e169eea1a8eb445a65c1a883fa191122e8 commit 806d26e169eea1a8eb445a65c1a883fa191122e8 Author: Olivier Certner AuthorDate: 2026-03-21 13:39:04 +0000 Commit: Olivier Certner 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