From nobody Fri Dec 26 09:30:40 2025 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 4dd0hx13t6z6LHkH for ; Fri, 26 Dec 2025 09:30:41 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dd0hw5RpJz3MLh for ; Fri, 26 Dec 2025 09:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7eXxPvTyzzvfboq7yMY5+hGVTVGr9zFJUIMuX3YSOKc=; b=jf4CufDIz3xOkKlnb/zTnYanitFk1l5lOw8aka3mQ2W3kmyL/a/yzi/NvFdEHnFEsHoYCW NTgJO2JlVYZ2oRvVukjfTu40Mhi3MBgETTrotJf9Ja1pvZGZXK2ITk2WwqmAdTasFWOQQg 2quxGhY49jKgmEBeo3Sycs5Lo1r7anDtE6M5T0leJevd24GVZXyvu9LGz++YSt65ZOCVmO rqsq4iJ/ly2CahnE7r1us+IgUydvnFMyrKmbmOMa0bhVZT0aRthxmi5tLvTw1YA4SEgrff Qqzw/bIULOOcfyp87h/di/lnbwIhnphr+4F3QosuWayMkY5Gsk7QVQ1lAQc1Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766741440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7eXxPvTyzzvfboq7yMY5+hGVTVGr9zFJUIMuX3YSOKc=; b=xLiSYDdJYVXxbwvfXD7nXuTOgubRQuJqhZCiLwl9O/lEaVyhf623rjUibwe/zGoMD1QqGA CgwLefoicdCNxiYKUrQIFMhHs2BQbKE7MUHZKXe4iLYgp62MlK0bqjAyCIAjn6fDFHzRIr ZZNvoEd5Sr0GqBLPjHuUogEpmPZXdl30e43yQAWoG6QKIeQRmVrdT0JKtjRf9KkdV97cEk /KIDf5R59PcndPrfGy4J6Ulptern2dWCdcwiicXxQR7VPFkQHx2kqprPb9jnTHORFbQoo2 m5VI0BGKWfA1CKTHjM6HnPRwRCDO1OFOjaM3uHT8XQS5U37m1LhKRuqmx9USWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766741440; a=rsa-sha256; cv=none; b=Fu7YQZlGN0dSBOxYHAMbU8MJ/wHdftxK1fMG4NTyTnEnedLtRMhfmgjN2ynTq/NDmmtIcL Cy4CSeR4T+bWe3e0PS9lbeFWSQxA61Ei31WWIPWbhvOK5tc1XUMBX3RDJbw5ywaxDae/oA Rf0rzrN0NxMDxwAMf5H9GEUSgpXpXZC4AJDgX+MRE2yZWGYYmEThyl1dxjHasMaI2fSq4b hZQHheXv5auqMWBUaxDLpdtGRMQ2AdCucoJm4KazX2G+2+nowLOcCQ6IH1nPBqWlhil6rx Q4yZIqAAZi0ZHW2fBFhQDKjYA1aAeGTxslaX8QI90WWUV2X/oUp+igmeN8yUNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dd0hw4hv2z16SC for ; Fri, 26 Dec 2025 09:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8690 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Dec 2025 09:30:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Justin Hibbits From: Zhenlei Huang Subject: git: bcd1e5fb540f - stable/14 - mac_ipacl: Use IfAPI 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bcd1e5fb540ffed26b25f520a69e092423f8ccaa Auto-Submitted: auto-generated Date: Fri, 26 Dec 2025 09:30:40 +0000 Message-Id: <694e55c0.8690.279c009@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bcd1e5fb540ffed26b25f520a69e092423f8ccaa commit bcd1e5fb540ffed26b25f520a69e092423f8ccaa Author: Justin Hibbits AuthorDate: 2023-08-25 16:44:17 +0000 Commit: Zhenlei Huang CommitDate: 2025-12-26 08:25:47 +0000 mac_ipacl: Use IfAPI Use `if_t` instead of `struct ifnet *`, and if_name() accessor. Sponsored by: Juniper Networks, Inc. (cherry picked from commit b820820ece099a73511d7daec407d78f38185a9b) --- sys/security/mac_ipacl/mac_ipacl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/security/mac_ipacl/mac_ipacl.c b/sys/security/mac_ipacl/mac_ipacl.c index 69802845252a..eed3eddace89 100644 --- a/sys/security/mac_ipacl/mac_ipacl.c +++ b/sys/security/mac_ipacl/mac_ipacl.c @@ -315,7 +315,7 @@ SYSCTL_PROC(_security_mac_ipacl, OID_AUTO, rules, static int rules_check(struct ucred *cred, - struct ipacl_addr *ip_addr, struct ifnet *ifp) + struct ipacl_addr *ip_addr, if_t ifp) { struct ip_rule *rule; int error; @@ -342,7 +342,7 @@ rules_check(struct ucred *cred, continue; if (strcmp(rule->if_name, "\0") && - strcmp(rule->if_name, ifp->if_xname)) + strcmp(rule->if_name, if_name(ifp))) continue; switch (rule->af) { @@ -395,7 +395,7 @@ rules_check(struct ucred *cred, #ifdef INET static int ipacl_ip4_check_jail(struct ucred *cred, - const struct in_addr *ia, struct ifnet *ifp) + const struct in_addr *ia, if_t ifp) { struct ipacl_addr ip4_addr; @@ -415,7 +415,7 @@ ipacl_ip4_check_jail(struct ucred *cred, #ifdef INET6 static int ipacl_ip6_check_jail(struct ucred *cred, - const struct in6_addr *ia6, struct ifnet *ifp) + const struct in6_addr *ia6, if_t ifp) { struct ipacl_addr ip6_addr;