From nobody Mon Dec 22 02:23:51 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 4dZMQJ1rcnz6Ly4n 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 4dZMQH6Pchz3RK4 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=1766370231; 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=WaM6h3CVdC1S5HF55e5yMGd1xdYrd0vqsIkFLqPNgj+mv3oBv2cjsH2aSlp6M3WYyJFwgH SDNHjE9VMcUgw8ZDiAxyrbvKSa9PiItXf3aAlxfJL1EjrJQ4qkFN/FmBKVU1Yn7e56yUdm gBFhqJRyssT7Yuvbb49CxC/WhD4D2qo7nEJAPm9dzac0hNU963GNJWbMTZRmZJwrzRdq4X WJ2DqrMLHivYKrFpwdv7dV5OJa+iGvHyx0bH7wG9U0sfzLttvWU9TVUSDg3kAm65x/emYo J9kAEIIxIm9Z2OumVLRC+wgN84A1GFzLrqpf5J7SQUGdVVjeQypifEDgtFmFfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766370231; 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=hM1s4YWT8IKihKdrU7DFdZbSdNmDW+vz3maaUjXtH4nMoLTED4OQufMPbbqv4dtOlu2Ye4 0PKWj+umCW3SfTleVr7l0qEpNbdRaUm0CMzdwZi4xuqahpRsGaWkKCLOexd2wgHW6FtmAA 2gcekNNdpccsLIBHD76+opCOwyhVlYUYYWhpCs8Mu30lhaTOb/mrUWZeFOZifnGqm9B9Xw NK0fLBzr2MRI6skLNnEN4vXOHcr3JPT+NhDWSUiETZ2EldmFP4F5gILosqn1ezFDtn4jSb PEVJ3odvGxQm0Cf8HLMb9rat1v8UxYlwv7joxrnxBrWK09Q3fHTYGyW2v4RKTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766370231; a=rsa-sha256; cv=none; b=YkBNd7Z+LHYMZZ6rt4/5t2eDPynSkMo+/+oqfHgcoSJHmEWD++KVi2QlFcqJKI8Cx7Lgka wlBZdrVP4t4AGm1/kZjzt4nI6Fm2SJ2jZliF+Ycwrg3A/9CyafWFeKA9Fo0f6neY1eLuSU y0Mt8j5j6NN8ktR4f/HFXtLkU0Iz7QAvPCdJeggg0WVH/PmPjcSrvXyEQAujyuz5Io7Twz 0+K9s7t+tKD6ZhXwpMunLMOX8SJ+CPzMfx051k0o2x29R2GpGH2j4AilvY56pveirb2PSd AoEr2PiXXrXjeMyX2KVzXFoeC75T0zjw3BKz/vZUJqc54Zds7dCZzyMkJZhCUg== 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 4dZMQH616pz15sC 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 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: 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);