From nobody Thu Jul 23 10:00:42 2026 X-Original-To: dev-commits-src-all@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 4h5RT662SJz6lVqy for ; Thu, 23 Jul 2026 10:00:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h5RT63qr8z3VrC for ; Thu, 23 Jul 2026 10:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800842; 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=kZ/aumwzNQ0NWCR0f369BmcE7bLCe/JE69TiGiipDzw=; b=r+j33o4q2Gw/y4y2Sb4ieJUW1JRCaPf4lLh4LNd00kkB8DHuGfW/oFJMURFbru7rgm/8L4 fKWnx8BBXaGSeGaL30BXBaQuz5USPsx2WCMf5RtaEN1iJNEC7UmyEjDU7KEvqaJmXYZZV0 FmroQk37OJxsTELpREvCh+lt4s2nAyOdV9XAgOCcVffJ77/qyiNrPzNwNsk2H9j0KCFSZ+ jyvRO82ICxKjaELfUWSPOq90TmjPM0BSJrqAP1+KSHGvnk+yv55pBw/f9Jf+ecz5IRlKJg sBXa5q4G7PRNKN4QprwyNiVbWxmS4SNYJEZkm1rZLHShWNTBmKZPA6Vza0Bbxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800842; a=rsa-sha256; cv=none; b=gpDtnSog/K9x+kzgyy6Nal1uuY+b/OrcfRdH1k4A2TLXfrmSqoVNqnoZw4nAsD99GEWCM2 U7UjqAfQvFqCCJP07PRdwgpehtMWU51Wr14kkQ4zK/W1RMxwLDNKghi+BiW2z2ZcuEX85i QzlutmHDucRk7pnBFK0gEb9GqFcoMhWFwFi5OacRQcvgvDl8lXhGW+oGJSJQaa+QOOXGqa T1+kT3Oom65uUNIxcVn7CnEv6Io+TLXd+FayOv/2SnZoILQ+ZrYYHrgwaWWFpVQaKq3Bvr 5srkX7515l9ly29yqGYcTtXNmVr9iiaNnNFhCr1LVAMVSSJ3OE9lA3ODZE9vYQ== 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=1784800842; 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=kZ/aumwzNQ0NWCR0f369BmcE7bLCe/JE69TiGiipDzw=; b=cxX9PpdbWmkbKbuvHZdcz/PmlsDdpEWXPbEU+ThZOzV2PKXz6NvzSljFLoLhK32Fe1XnpP qVJkx9QmbuxhW4lg4Dm3wdqt0ek/VasL2Pf69k6tStJqN5DycUYp396uqq/0497GHcuoni BRbwqo0zz58RkYlw+tFH9pYjfkQ/qg8AmIA3zqidQvWSaaGtvF0lPDYjlP/aoUp9nEZ77f jyodLQhhCDSbFKVxDQkE2AxVIvytNB3OO/o1NbvCWjRyNsZvi8snH/YhS5mxFXoRJ4VX91 qE7HSz+d/EtXr7yQnXWnwt251FVrvJLQbYrXRxKrSagDIHdPXiTuHOVk3O8u4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RT62vyyz10sY for ; Thu, 23 Jul 2026 10:00:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be30 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:00:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 045b82909cb3 - stable/14 - MAC/do: Comments: Rephrase one, fix a typo in another List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/14 X-Git-Reftype: branch X-Git-Commit: 045b82909cb3c9cb982dc110d72217a42560e299 Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:00:42 +0000 Message-Id: <6a61e64a.3be30.44c2ed42@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=045b82909cb3c9cb982dc110d72217a42560e299 commit 045b82909cb3c9cb982dc110d72217a42560e299 Author: Olivier Certner AuthorDate: 2026-03-21 13:39:04 +0000 Commit: Olivier Certner 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