From nobody Thu Apr 03 19:32:29 2025 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 4ZTBhY6jRQz5sLss; Thu, 03 Apr 2025 19:32:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZTBhY47hkz3SmL; Thu, 03 Apr 2025 19:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743708749; 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=lVv2qUJzOfUePmTyZLXH6waHtr1qILqd52J927WOw5I=; b=W7e+PEBCRXzu09/UFRYdjEq3cbd2m+WIRwT7tVtdMdmlfomfzxZ83vYDWi2A+JHqvGUGnw f/9yYIQp+Y5DGK2H88+JvPs8d+jEurl7zumDZoF2lRJmiv5rb0/Ry7Fu1Lcoeeb/9YQfha QHQtEi1XB0dSitfXT7BzZWF17K9Fkb0UmLsbYDSd9hluCk/YMd3rJ70r8WMsNg2bx3KhHc In3J8Pmh4xympa1ZmvJ+q/XPHP2sdaLYqqahVG+7kWfwlixUEn9Btpv4bcIh9u2IyL1Uvu ldyyU53unuokhR/CfFGOrHPOLMvziuSBziYtJ49nt+BM0IUKjT9XN6fRyWCLTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743708749; a=rsa-sha256; cv=none; b=HZ7PiyRhT2aVlGACHiVsyTIvVZ1+SmZ+SCQ8i9U8nSFFoV3oGq2e0+z+JPgRatsa3cMz52 5oBLpCWSwa7HMjQzFRM9uNGp3OR+XSSnGLeq7gkfsn9eNnOLG7ZBuIwV1EmQ4VBZzAlyar iITyjSUZ5YsgNPniA6WBpZHV/FICvjUOoV3cAQNdWff4XDkUOawbMh5asxWcJDi10Y5yLJ vcwln57oWWry9cQAd7iU+KEQuDO6Ir18IC2bdxEocY9m6g7wnit4UkhYmL/FlPHPD8IoTP DJV+hiQ+Ogyla8lQ+N9trJwQDyIUS/i7XzXueXFVzGohm2rlwf4s/U3L3cZSQA== 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=1743708749; 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=lVv2qUJzOfUePmTyZLXH6waHtr1qILqd52J927WOw5I=; b=Pa+BXitBj+W/kyG0mz/TAVzUl4KCVZOd1O3FFgmeHbVOww9QfZDIqdEmmixIXVNdiwRBw5 wmY/41lZyumGErXJOzMsDS9e5dG6s5gOolhshnfIdrwVfEblS+juLwuRRoSzrzi875f+3l TekTJa3uDql2zzt2Az6/kK/3RwMo+m+z4oZny48UBKNPbYsTOJKcG8LTcpLGQwR7O677x1 lk5ViobsUvkwVnWsoDC04kxZ/lgl1k508OBssYYJFPbDepEAcuOYLHGMcxr88ujNbL0FDI YHEO3CStpFfRVgavnUwtonXuzfSybpQHVxufwylBEBf1RQmOjouhW5fKXjEB9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZTBhY3ZQ0zkX; Thu, 03 Apr 2025 19:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 533JWTvJ040570; Thu, 3 Apr 2025 19:32:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 533JWTU3040567; Thu, 3 Apr 2025 19:32:29 GMT (envelope-from git) Date: Thu, 3 Apr 2025 19:32:29 GMT Message-Id: <202504031932.533JWTU3040567@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 5e00a28b2f02 - stable/14 - MAC/do: toast_rules(): Minor simplification 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/14 X-Git-Reftype: branch X-Git-Commit: 5e00a28b2f02a820f9cf9e04b38839f8da835db8 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=5e00a28b2f02a820f9cf9e04b38839f8da835db8 commit 5e00a28b2f02a820f9cf9e04b38839f8da835db8 Author: Olivier Certner AuthorDate: 2024-08-13 08:53:24 +0000 Commit: Olivier Certner CommitDate: 2025-04-03 19:31:05 +0000 MAC/do: toast_rules(): Minor simplification Use the most common pattern to browse and delete elements of a list, as it reads quicker. Reviewed by: bapt Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D47622 (cherry picked from commit 2110eef4bf608b6c1facc57c68d02960b6d880c9) --- sys/security/mac_do/mac_do.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/security/mac_do/mac_do.c b/sys/security/mac_do/mac_do.c index 2ce608c754bc..dc5933930a41 100644 --- a/sys/security/mac_do/mac_do.c +++ b/sys/security/mac_do/mac_do.c @@ -311,10 +311,9 @@ static void toast_rules(struct rules *const rules) { struct rulehead *const head = &rules->head; - struct rule *rule; + struct rule *rule, *rule_next; - while ((rule = TAILQ_FIRST(head)) != NULL) { - TAILQ_REMOVE(head, rule, r_entries); + TAILQ_FOREACH_SAFE(rule, head, r_entries, rule_next) { free(rule->uids, M_DO); free(rule->gids, M_DO); free(rule, M_DO);