Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Nov 2023 04:42:25 GMT
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 194df014feeb - main - ipfw: fix copy&paste bug for number:array tables
Message-ID:  <202311140442.3AE4gPj9099392@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by ae:

URL: https://cgit.FreeBSD.org/src/commit/?id=194df014feebd8b169b41ecd75ae73d63a792d6b

commit 194df014feebd8b169b41ecd75ae73d63a792d6b
Author:     Andrey V. Elsukov <ae@FreeBSD.org>
AuthorDate: 2023-11-14 04:37:04 +0000
Commit:     Andrey V. Elsukov <ae@FreeBSD.org>
CommitDate: 2023-11-14 04:37:04 +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
---
 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);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311140442.3AE4gPj9099392>