From nobody Tue Nov 21 10:50:35 2023 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 4SZLkg67Qhz51N55; Tue, 21 Nov 2023 10:50:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SZLkg5fG2z3Ftb; Tue, 21 Nov 2023 10:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700563835; 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=JHgHLOvl0FbUQC+OXK6vjE045CmwNLwqBS+7giIiBA4=; b=M6mjCXm/4GgpCPF4AhuXCmqZ22OK6WGBinZX83dgdFvlIrtaQ6X6j4pXjdBGDUgyE8eQPY mECo9jUqn+SM97uez98eUOYkd6noubfNY4/uzMelEQDdSONK794ybwrbrBop7rJi6xBANO CEwXDIvh2KQuRPcvJ1ecE4N7SbCb9zfPd+S9fa/QZk74Po6k3pcGh97OIJ4YtinjAKhSZ9 zjQ2oWcvQxryqaUUxxZSIGlKOhRdzrGGCOIGHg3Lp59uRHPoxlvolI6d+97yewAf4k4iLE VlO1iDAHbFbREafhoZPLTaJY8aCyONum0ko8/V+frOjdsh9SL0/hNGDGjXSvzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700563835; 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=JHgHLOvl0FbUQC+OXK6vjE045CmwNLwqBS+7giIiBA4=; b=FpX1BGLmfM+ATNniF8vFdBT0zTPFmtkQsknrH6CLj9x3644jnmGyGexwiJWds6KQnYUDM3 7VsZs+FpgKBcpBoabz3/GGxqZKfVV8kmC55SVkURX3uz7o+w6IEH7jRTrUMVLIBoQyAbbI /7s2eR5NQk5a3Vl8OhxpZOpd4QAxhj26q/LdtRxynevZ7D95E5kz6vYY3UNOR533aeN7MQ JE8ZU4Z6hgyDksKKS4XX8SXyjB7ZBIbDTmFoVZBHyVT1g8PujI/nMQXz4VRtB+KDkqFCES u2yqgrTxeBNxRxBuAhSaonsrz37CtmVfaFcZlqfbox4xgBvslzRnLhw3RyqcTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700563835; a=rsa-sha256; cv=none; b=tUzeXmrd2juw8TtcZoRVZoMuqBaq5DJ1/hQ+gPPzJh8xxGEavogR59xMkltTMoPlLZtA/0 AmAuTZ1e2GkczOAi92NHlImCdahMIYUvvLxGAQB1vUW9pjbqSAyEE8lJETsBBh2tycyvB6 mNqrB3N9cxd3lVTzKW7xbvbvuRAv2eDZyOITHiD+VtU6vQfHsqrBFf/SRvClnXEvJsoH3A nuKTm86FW1mDyQfH9SZwEuxO90Ds35smPJ5ksiYN+MnxXjyvAhPBwGcCTuu38ACv9GyZG3 2DwtAF6AvRPaPLil+75z5hzX9HH8r5aHDX3NETrrCv0T0GTEfnrM2emfHzo6qA== 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 4SZLkg4hp7zXfw; Tue, 21 Nov 2023 10:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ALAoZVO067679; Tue, 21 Nov 2023 10:50:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALAoZZV067676; Tue, 21 Nov 2023 10:50:35 GMT (envelope-from git) Date: Tue, 21 Nov 2023 10:50:35 GMT Message-Id: <202311211050.3ALAoZZV067676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: f327a5765b77 - stable/14 - ipfw: fix copy&paste bug for number:array tables 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f327a5765b77e4e465117739957bfe45869bd98b Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=f327a5765b77e4e465117739957bfe45869bd98b commit f327a5765b77e4e465117739957bfe45869bd98b Author: Andrey V. Elsukov AuthorDate: 2023-11-14 04:37:04 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-11-21 10:49:32 +0000 ipfw: fix copy&paste bug for number:array tables Use compare_numarray() method for binary search. This fixes table lookups for keys greater than UINT16_MAX. Obtained from: Yandex LLC MFC after: 1 week Sponsored by: Yandex LLC (cherry picked from commit 194df014feebd8b169b41ecd75ae73d63a792d6b) --- sys/netpfil/ipfw/ip_fw_table_algo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/ipfw/ip_fw_table_algo.c b/sys/netpfil/ipfw/ip_fw_table_algo.c index 2fa65c78c453..89e6b69bc3ad 100644 --- a/sys/netpfil/ipfw/ip_fw_table_algo.c +++ b/sys/netpfil/ipfw/ip_fw_table_algo.c @@ -2693,7 +2693,7 @@ numarray_find(struct table_info *ti, void *key) struct numarray *ri; ri = bsearch(key, ti->state, ti->data, sizeof(struct numarray), - compare_ifidx); + compare_numarray); return (ri); }