From 4187bba080530c5ca1c7dae9c233e88f3fc8f535 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Jul 2024 08:06:16 +0100 Subject: gentoo auto-resync : 06:07:2024 - 08:06:15 --- net-firewall/ipset/Manifest | 3 + .../ipset/files/ipset-7.22-argv-bounds.patch | 36 +++++++ .../files/ipset-7.22-asan-buffer-overflow.patch | 52 +++++++++ net-firewall/ipset/ipset-7.22-r1.ebuild | 120 +++++++++++++++++++++ 4 files changed, 211 insertions(+) create mode 100644 net-firewall/ipset/files/ipset-7.22-argv-bounds.patch create mode 100644 net-firewall/ipset/files/ipset-7.22-asan-buffer-overflow.patch create mode 100644 net-firewall/ipset/ipset-7.22-r1.ebuild (limited to 'net-firewall/ipset') diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest index 1c7f20a8af30..a317e1add031 100644 --- a/net-firewall/ipset/Manifest +++ b/net-firewall/ipset/Manifest @@ -1,3 +1,5 @@ +AUX ipset-7.22-argv-bounds.patch 1132 BLAKE2B 44edaaf8858c386eaa8d98a67ab41a8bc2f8842926ac73e197f07e6ba5971a26f2f1b8a7c19b620be3e834086f7db3e90cb56b4906fffbc94ef311bc66a74636 SHA512 3e1da81668320cf1742dee973a11f060ee0924ae504eba31c625620062ac3cab4f60d96a9af183cd8b365755838723ef3a6dad49b0068f9e69585951f9c81299 +AUX ipset-7.22-asan-buffer-overflow.patch 2589 BLAKE2B 09714f315561ae0cb11a268364254b334e6f776dd66ca2cdffac1335e70c9839c765e85f1947f6d58156179f033e3e2e3421f62ffea65fc0816f13bd3db377c3 SHA512 05f99044eb6285683945e2ba4b0fa973c01239bb97e63f0c492ca8f36927054e21040e42192188391fcb9342ee615ab28f4346b894afa2e7958e0bcd74143288 AUX ipset-bash-completion.patch 502 BLAKE2B 31d3ebfe59506f24e74c45912aabd87d853643d0eebf7e88a260964cbed5ff44cae870d9ba47879f81bd9f4bc784e7f28fb80e144f72acfcf2caff02abcea83f SHA512 682d2dfcc7e115824a9883ba58118a27c0075bea08444f74c9a12678ac3dc10592f9f7cafa55dfa96969f89b64300d58507630210050fb2f8237b917118f2418 AUX ipset.confd-r1 666 BLAKE2B 852963fd27d11f58305f33cc9be84d5eabde73f5af4924d97ad188505fa64b2c75f31ece180e2992d275738305b7a731afc8b911314a9f202320c0c61053fc9b SHA512 6020665ba30fc9efa7c16714c1ff7a0961153175b70ca5817f72c4123537e0ff9a977b8ca71914ef8b49d431601b73275b2ab6f848d521b53680b0cd7bcaca82 AUX ipset.initd-r6 3386 BLAKE2B 1b3c0de0cc45fe80d3e0ba8a90fb2433ec3a6c2df38d50030cafea0b67562644918186e82e1c92a314f8e75939a0302a1574ae78fedbc9da9016ac3d0fd82e20 SHA512 ca821d2d22826d10f87e0c318b52faf10a339174f2ab27fb427b87f41b824ea8b74523b776465dd43edd1fa3cb311b11a6c9972f1d24f007ad60b87895860d2d @@ -7,5 +9,6 @@ DIST ipset-7.21.tar.bz2 687746 BLAKE2B bb887a6e74f11df8e24e13c767d21761fe547e90d DIST ipset-7.22.tar.bz2 694069 BLAKE2B 9daaff54adb6f9daf69cd7dabbd9134d8fcf8cd7f8ef0c52296961579ad3c8202087158a01664228eff70356ba97f77ec61abbab7c7ce323112fbdc32abd661b SHA512 e375a9110eb7974480147c57eb2cff4bdd03c7704cdae006a3d254cc80fada587aa8aee25a86f7cab29db83f5e283c5f9a47a314297317660ebba5097f623d79 EBUILD ipset-7.21-r1.ebuild 3434 BLAKE2B 1b43d5f7768a84099ee0c012cc198cd4e7e0856ebec3a67a175d90bbb7a299596afa640674397250d2a9246b657280d60a4f40f36689449ed0590b119239440f SHA512 74a8ce301c3364460391c5322d8cb80db9d191877da80ab39a8f17d5e1ffa38a6d65ed226ca67b8452d8d8e87299d67fa2944b9ee6fa79624ff18bb7a3e17c88 EBUILD ipset-7.21.ebuild 3434 BLAKE2B 17ef8882a3b6c16edf749d9a144dbf5f7850a4927a76de448c3f0fc617def6de721d78ffab0cc5b0082eb3a5ebc0943d3d06a1493c22387038913c4488e0bd91 SHA512 9a978db628a6bc4f40e1076c2cc169771abfb579bf90dd76b72efd809abd953ecb440a62def5fb405b90e9b2ad4337ba7f45ebbc7498bb686c2d66d87165fbf4 +EBUILD ipset-7.22-r1.ebuild 3521 BLAKE2B 8c9cc6e56254d19c09fbad8a52f06ef397fef9d9c68410057ce39a251fc7efa61a9dfeb6e8d93c1fb9b0130ef1425109acbb19969d6a1ffb35c317c0e3408af4 SHA512 e84645df916bb105793dfbf9a67efc0fe7990f51f9c5c6bcf3572eb111258b3fd7a8510afd54b6a6e2acedf09e94b861114bcab7f92fd6d318437162961947f3 EBUILD ipset-7.22.ebuild 3440 BLAKE2B 14e8ebb5c528247e99545da9ab5493d4ab5cef881a62ae95ac5a06f89e635487e2b98ad181d097e1f381c8c9dd241e80e43e701114ef7eb581545916cf885edb SHA512 c05777a60ddb27f6fae77f2dcfc4f1518b6be5b1849e8d47647f0ec002f1d4e71cfa87c565e5f968d2749874b6336f42f62058143ed87d520f7f23e1f52d3291 MISC metadata.xml 475 BLAKE2B e1e06003a410249ed76d39b74ccbcd64b8572ff05f1c818729d787cecfb19cfa9c7e3463473688abc7a398efb908b0c7145bad88bbb7259e69f1b7d985584bcc SHA512 d0a3dca6593e8a62cbf5c325eb59b620137af8d8f5a463702c4d6ec102fd03b8adbbdcd9358777d0461f57a98d892d359d80b8f722d3f322f3d4766d762f6585 diff --git a/net-firewall/ipset/files/ipset-7.22-argv-bounds.patch b/net-firewall/ipset/files/ipset-7.22-argv-bounds.patch new file mode 100644 index 000000000000..07d18303642e --- /dev/null +++ b/net-firewall/ipset/files/ipset-7.22-argv-bounds.patch @@ -0,0 +1,36 @@ +https://git.netfilter.org/ipset/commit/?id=851cb04ffee5040f1e0063f77c3fe9bc6245e0fb + +From 851cb04ffee5040f1e0063f77c3fe9bc6245e0fb Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Thu, 27 Jun 2024 10:18:17 +0200 +Subject: lib: ipset: Avoid 'argv' array overstepping + +The maximum accepted value for 'argc' is MAX_ARGS which matches 'argv' +array size. The maximum allowed array index is therefore argc-1. + +This fix will leave items in argv non-NULL-terminated, so explicitly +NULL the formerly last entry after shifting. + +Looks like a day-1 bug. Interestingly, this neither triggered ASAN nor +valgrind. Yet adding debug output printing argv entries being copied +did. + +Fixes: 1e6e8bd9a62aa ("Third stage to ipset-5") +Signed-off-by: Phil Sutter +Signed-off-by: Jozsef Kadlecsik +--- a/lib/ipset.c ++++ b/lib/ipset.c +@@ -343,9 +343,9 @@ ipset_shift_argv(int *argc, char *argv[], int from) + + assert(*argc >= from + 1); + +- for (i = from + 1; i <= *argc; i++) ++ for (i = from + 1; i < *argc; i++) + argv[i-1] = argv[i]; +- (*argc)--; ++ argv[--(*argc)] = NULL; + return; + } + +-- +cgit v1.2.3 diff --git a/net-firewall/ipset/files/ipset-7.22-asan-buffer-overflow.patch b/net-firewall/ipset/files/ipset-7.22-asan-buffer-overflow.patch new file mode 100644 index 000000000000..56d126db5efa --- /dev/null +++ b/net-firewall/ipset/files/ipset-7.22-asan-buffer-overflow.patch @@ -0,0 +1,52 @@ +https://git.netfilter.org/ipset/commit/?id=f1bcacf5eeb8620ea684524e1ce9c3951a77f1f9 + +From f1bcacf5eeb8620ea684524e1ce9c3951a77f1f9 Mon Sep 17 00:00:00 2001 +From: Phil Sutter +Date: Thu, 27 Jun 2024 10:18:16 +0200 +Subject: lib: data: Fix for global-buffer-overflow warning by ASAN + +After compiling with CFLAGS="-fsanitize=address -g", running the +testsuite triggers the following warning: + +| ipmap: Range: Check syntax error: missing range/from-to: FAILED +| Failed test: ../src/ipset 2>.foo.err -N test ipmap +| ================================================================= +| ==4204==ERROR: AddressSanitizer: global-buffer-overflow on address 0x55a21e77172a at pc 0x7f1ef246f2a6 bp 0x7fffed8f4f40 sp 0x7fffed8f46e8 +| READ of size 32 at 0x55a21e77172a thread T0 +| #0 0x7f1ef246f2a5 in __interceptor_memcpy /var/tmp/portage/sys-devel/gcc-13.2.1_p20231014/work/gcc-13-20231014/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:899 +| #1 0x55a21e758bf6 in ipset_strlcpy /home/n0-1/git/ipset/lib/data.c:119 +| #2 0x55a21e758bf6 in ipset_data_set /home/n0-1/git/ipset/lib/data.c:349 +| #3 0x55a21e75ee2f in ipset_parse_typename /home/n0-1/git/ipset/lib/parse.c:1819 +| #4 0x55a21e754119 in ipset_parser /home/n0-1/git/ipset/lib/ipset.c:1205 +| #5 0x55a21e752cef in ipset_parse_argv /home/n0-1/git/ipset/lib/ipset.c:1344 +| #6 0x55a21e74ea45 in main /home/n0-1/git/ipset/src/ipset.c:38 +| #7 0x7f1ef224cf09 (/lib64/libc.so.6+0x23f09) +| #8 0x7f1ef224cfc4 in __libc_start_main (/lib64/libc.so.6+0x23fc4) +| #9 0x55a21e74f040 in _start (/home/n0-1/git/ipset/src/ipset+0x1d040) +| +| 0x55a21e77172a is located 54 bytes before global variable '*.LC1' defined in 'ipset_bitmap_ip.c' (0x55a21e771760) of size 19 +| '*.LC1' is ascii string 'IP|IP/CIDR|FROM-TO' +| 0x55a21e77172a is located 0 bytes after global variable '*.LC0' defined in 'ipset_bitmap_ip.c' (0x55a21e771720) of size 10 +| '*.LC0' is ascii string 'bitmap:ip' + +Fix this by avoiding 'src' array overstep in ipset_strlcpy(): In +contrast to strncpy(), memcpy() does not respect NUL-chars in input but +stubbornly reads as many bytes as specified. + +Fixes: a7432ba786ca4 ("Workaround misleading -Wstringop-truncation warning") +Signed-off-by: Phil Sutter +Signed-off-by: Jozsef Kadlecsik +--- a/lib/data.c ++++ b/lib/data.c +@@ -111,6 +111,9 @@ ipset_strlcpy(char *dst, const char *src, size_t len) + assert(dst); + assert(src); + ++ if (strlen(src) < len) ++ len = strlen(src) + 1; ++ + memcpy(dst, src, len); + dst[len - 1] = '\0'; + } +-- +cgit v1.2.3 diff --git a/net-firewall/ipset/ipset-7.22-r1.ebuild b/net-firewall/ipset/ipset-7.22-r1.ebuild new file mode 100644 index 000000000000..ea41c067906b --- /dev/null +++ b/net-firewall/ipset/ipset-7.22-r1.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MODULES_OPTIONAL_IUSE=modules +inherit autotools bash-completion-r1 linux-mod-r1 systemd + +DESCRIPTION="IPset tool for iptables, successor to ippool" +HOMEPAGE="https://ipset.netfilter.org/ https://git.netfilter.org/ipset/" +SRC_URI="https://ipset.netfilter.org/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" + +RDEPEND=" + net-firewall/iptables + net-libs/libmnl:= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( ChangeLog INSTALL README UPGRADE ) + +# configurable from outside, e.g. /etc/portage/make.conf +IP_NF_SET_MAX=${IP_NF_SET_MAX:-256} + +PATCHES=( + "${FILESDIR}/${PN}-bash-completion.patch" + "${FILESDIR}/${P}-asan-buffer-overflow.patch" + "${FILESDIR}/${P}-argv-bounds.patch" +) + +src_prepare() { + default + eautoreconf +} + +pkg_setup() { + get_version + CONFIG_CHECK="NETFILTER" + ERROR_NETFILTER="ipset requires NETFILTER support in your kernel." + CONFIG_CHECK+=" NETFILTER_NETLINK" + ERROR_NETFILTER_NETLINK="ipset requires NETFILTER_NETLINK support in your kernel." + # It does still build without NET_NS, but it may be needed in future. + #CONFIG_CHECK="${CONFIG_CHECK} NET_NS" + #ERROR_NET_NS="ipset requires NET_NS (network namespace) support in your kernel." + CONFIG_CHECK+=" !PAX_CONSTIFY_PLUGIN" + ERROR_PAX_CONSTIFY_PLUGIN="ipset contains constified variables (#614896)" + + build_modules=0 + if use modules; then + if linux_config_src_exists && linux_chkconfig_builtin "MODULES" ; then + if linux_chkconfig_present "IP_NF_SET" || \ + linux_chkconfig_present "IP_SET"; then #274577 + eerror "There is IP{,_NF}_SET or NETFILTER_XT_SET support in your kernel." + eerror "Please either build ipset with modules USE flag disabled" + eerror "or rebuild kernel without IP_SET support and make sure" + eerror "there is NO kernel ip_set* modules in /lib/modules//... ." + die "USE=modules and in-kernel ipset support detected." + else + einfo "Modular kernel detected. Gonna build kernel modules..." + build_modules=1 + fi + else + eerror "Nonmodular kernel detected, but USE=modules. Either build" + eerror "modular kernel (without IP_SET) or disable USE=modules" + die "Nonmodular kernel detected, will not build kernel modules" + fi + fi + + [[ ${build_modules} -eq 1 ]] && linux-mod-r1_pkg_setup +} + +src_configure() { + export bashcompdir="$(get_bashcompdir)" + + econf \ + --enable-bashcompl \ + $(use_with modules kmod) \ + --with-maxsets=${IP_NF_SET_MAX} \ + --with-ksource="${KV_DIR}" \ + --with-kbuild="${KV_OUT_DIR}" +} + +src_compile() { + einfo "Building userspace" + + local modlist=( xt_set=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/: + em_ipset=kernel/net/sched:"${S}":kernel/net/sched/:modules ) + + for i in ip_set{,_bitmap_{ip{,mac},port},_hash_{ip{,mac,mark,port{,ip,net}},mac,net{,port{,net},iface,net}},_list_set}; do + modlist+=( ${i}=kernel/net/netfilter/ipset/:"${S}":kernel/net/netfilter/ipset ) + done + + emake + + if [[ ${build_modules} -eq 1 ]]; then + einfo "Building kernel modules" + linux-mod-r1_src_compile + fi +} + +src_install() { + einfo "Installing userspace" + default + + find "${ED}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/ipset.initd-r7 ${PN} + newconfd "${FILESDIR}"/ipset.confd-r1 ${PN} + systemd_newunit "${FILESDIR}"/ipset.systemd-r1 ${PN}.service + keepdir /var/lib/ipset + + if [[ ${build_modules} -eq 1 ]]; then + einfo "Installing kernel modules" + linux-mod-r1_src_install + fi +} -- cgit v1.2.3