From nobody Tue Nov 21 10:51:44 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 4SZLm06RHgz51N0m; Tue, 21 Nov 2023 10:51:44 +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 4SZLm05xRLz3GjZ; Tue, 21 Nov 2023 10:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700563904; 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=szN5a53Gx2kcWxlsff2Kyz8IC5BKizRrL6dLKge6tFE=; b=UAh7B4mawXdh2h6CfKLWr7aNgcb8A2ktXKMQlAObcl7Vc70wjYHeFqhKCcxPjOZPIXAKDL WnEvWBF7aSI0OZ4J/trwOnS+aNba8zU+2QDe4tetgYHHz8QReCkw1DtCd9pf0UW8crVbRG 15p2RFv8ngUdWxGimD41ZI4+9229x8+s3+wvsTzPmklbkRKAvEWbITlAJ99wrqV83Ldem1 4Vpb+5TzJb5rTxjllnPi6tSMzIl3a7pdLvm6VaPtL0b76gBCGu70jFNxA72rD6Dw5uU2Vy IWjm307JfcLaaR3fNWhK73BktMSExdhmOExZLYILFPU8DCX8NjRI3OS1W5qtug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700563904; 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=szN5a53Gx2kcWxlsff2Kyz8IC5BKizRrL6dLKge6tFE=; b=B8Dovscv9DXmOmlCPy17HCGrgvAYuUnwVmtLrChGJeKR8QyYjHZ31djlzdhcIIkncYuGuG nT4tiIYSVf/ybBz2AbFS1G8f4p6N2EMJmwwGOBHatx7rpj6ZkM3cyjxSipF5XLnzgCIte2 APxFDe722WX0BrIcIeeLkLUJzecy6Ya+IdPE3+fvzT8VynSRCcYvgJZJjsSpwRaiVhfNXh 758Irvj9pvj0U+x+B2/6muqwsrgHH18U9KtUMS7p4zoKczR11Xvyh3IPsZVZpJj3JzPN8q SI9uIkk+PQF9KG+EvOCJtXLa5JD3AGqtDC2pnmwL41GZ/R8bHWLsXUTqlaukMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700563904; a=rsa-sha256; cv=none; b=kFSRdzT++BNR8cVd0hlCsNP9LqZcHRspNxnCeH+/k2CsCL4pPW87ztUdHymUtv/9PTx8Xe KVptY/8RxwO3c8R7agskvwPOOjJVaMvO0vCfdaXi5iyDD7ph0qrWtw+sWBuTyrxMgukomF XJyrQDA5DVe6njce7NV3FM19VssKsdUcyRbSVG/B11Vuw35YnG6yHDsZFwQ00mR0sDfek3 cyFTyAzT2RpOe3a+dYZnHdzCB2QerW5n3OLUFtlnTPiL0HNFnmh7wR16hJlMJAhU6zAn+J Ik1j5DdOIvu56nF8whh+aAbNeNxJWbBQS5CDIM7qfl1x/wHdYS52XIfdLw0WWA== 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 4SZLm050VqzYQ5; Tue, 21 Nov 2023 10:51:44 +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 3ALApiHN071314; Tue, 21 Nov 2023 10:51:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALApint071311; Tue, 21 Nov 2023 10:51:44 GMT (envelope-from git) Date: Tue, 21 Nov 2023 10:51:44 GMT Message-Id: <202311211051.3ALApint071311@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: e7a86775f751 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: e7a86775f7510ad57409adfdfbd3ccaf3a31bed2 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=e7a86775f7510ad57409adfdfbd3ccaf3a31bed2 commit e7a86775f7510ad57409adfdfbd3ccaf3a31bed2 Author: Andrey V. Elsukov AuthorDate: 2023-11-14 04:37:04 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-11-21 10:51:15 +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 44750b8baa7b..f2ea1ddfc384 100644 --- a/sys/netpfil/ipfw/ip_fw_table_algo.c +++ b/sys/netpfil/ipfw/ip_fw_table_algo.c @@ -2696,7 +2696,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); }