From nobody Mon Dec 22 02:23:51 2025 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 4dZMQJ2Q8Lz6Ly9X for ; Mon, 22 Dec 2025 02:23:52 +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 4dZMQH6j1Nz3RK5 for ; Mon, 22 Dec 2025 02:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370232; 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=7+nCuss8CgAruyyhr1VmDIIe1CfjGJvNX1/HbZJq/r8=; b=ohxdNfBHvcpUmwq450MZmks/Yuman/ihWvSQOKOCkwutLIQjxRJRM2A0OR2wyYnZO432oA GjvgYSSGQ6OeRAUD//MoOKhgUKN9gAP2fIE38PSOyeqycWTFZ6DtBaehufQJMWjvuBMXjz gr3QyHw9UERQ8qXE5E0//EdEl6e3AumQHbMNwG2HNjY6/Wc6CDSR2TZEniqof+50/9BA/7 lu/ZNe5DX/Q2t+dVAeeZulPYNkMkfsRbGgtLRUfIKjY8nG+hHdxhLvFqvfzFy3fPx9WG23 kE4JSubWifH5FxzVyC4U+KXf1bJmDPiVOFfJMTnovH3fPrIxwrxjb1ROP1CKkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370232; 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=7+nCuss8CgAruyyhr1VmDIIe1CfjGJvNX1/HbZJq/r8=; b=FGuPwjI1W1uY+3p3ek7dJekqfC9PaZ3AK5sI/Wy6h4lovnL00e7qG01k8oCGTBmqdde+z/ rAf8llY9W2sEzJyZkxUK+P0+M/Jt94NJSN6EkGTXSx4bYJezX7tZFpstcyXYF7njltFSb+ jU+fWqont9kRWAcpDcq/8yOU3m23v3LXwGw/5SnPUTpd5PxjXpTNh1uix7a5hw3Nens2zD dBXDEmtChOfnYmTEkmtBwo/+PxIujRNklIKmcZMJuFDnx8iEPttuyvqiWnZsa73H9A7RJt VuuZgfkucNXazQqS5AkqzkMMgcxJx4Wc9bGAkMBRJGaxItjRj8DBMPoohqvhvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370232; a=rsa-sha256; cv=none; b=DSaSj15rhyRKpbeIZWPQkgzMDLdnCagQ5aiiVhPk2FmESqg79ZrEmZmRk+1RnpoiZwPAYz sr2gqmQpKRnxUF8vsDLwaPlOf0lYXRjZjO/HgAcLFlCwYcbg2iVDZN+8K1sJdQQwr13oSa qAyCELHr5VAzIiEi8e26EcLTSKd6bw1XXtYDi+9staPMCwhqw2+/0BbZUddk5F6VQLEX5D hUqI7h++AdbaXCmumSuGb171j1gvxECBTHCaDr7nD8iiGZAjs27+tRh1Mxj8IoBCWnPIXo qJEK1xNynZiZXHvkHbyjR36TEli/kSRCOAOIwWegi8nhTnQO7ziyTNJthAvH9g== 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 4dZMQH617Nz15pb for ; Mon, 22 Dec 2025 02:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37f05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Dec 2025 02:23:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 129e15d49943 - main - ipfw: fix bpf tap point lookup 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 129e15d4994311958db59a1718d4ff42d440ce2b Auto-Submitted: auto-generated Date: Mon, 22 Dec 2025 02:23:51 +0000 Message-Id: <6948abb7.37f05.2a08a421@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=129e15d4994311958db59a1718d4ff42d440ce2b commit 129e15d4994311958db59a1718d4ff42d440ce2b Author: Gleb Smirnoff AuthorDate: 2025-12-22 01:18:27 +0000 Commit: Gleb Smirnoff CommitDate: 2025-12-22 02:23:14 +0000 ipfw: fix bpf tap point lookup The trick I blindly used works for pointers to structs, but not for rule numbers that can differ only by 1. PR: 291854 Fixes: 3daae1ac1d82ecdcd855101bab5206e914b12350 --- sys/netpfil/ipfw/ip_fw_bpf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_bpf.c b/sys/netpfil/ipfw/ip_fw_bpf.c index aa92d30007c2..d9897f700d57 100644 --- a/sys/netpfil/ipfw/ip_fw_bpf.c +++ b/sys/netpfil/ipfw/ip_fw_bpf.c @@ -63,10 +63,10 @@ struct ipfw_tap { char name[sizeof("ipfw4294967295")]; }; -static int32_t +static inline int tap_compare(const struct ipfw_tap *a, const struct ipfw_tap *b) { - return ((int32_t)(a->rule/2 - b->rule/2)); + return (a->rule != b->rule ? (a->rule < b->rule ? -1 : 1) : 0); } RB_HEAD(tap_tree, ipfw_tap); VNET_DEFINE_STATIC(struct tap_tree, tap_tree);