commit: 422a605a2b44be4e19e81a0d07eca2abdaf291fe Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Mar 21 09:16:53 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 21 09:17:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422a605a
net-libs/libnftnl: fix tests under Valgrind Test-only fix. Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/libnftnl-1.2.8-valgrind-tests.patch | 47 ++++++++++++++++++++++ net-libs/libnftnl/libnftnl-1.2.8.ebuild | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch b/net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch new file mode 100644 index 000000000000..62f69a1feedf --- /dev/null +++ b/net-libs/libnftnl/files/libnftnl-1.2.8-valgrind-tests.patch @@ -0,0 +1,47 @@ +https://git.netfilter.org/libnftnl/commit/?id=ff37c01480cd0b938658d180ff5c7b1958ad250f + +From ff37c01480cd0b938658d180ff5c7b1958ad250f Mon Sep 17 00:00:00 2001 +From: Phil Sutter <[email protected]> +Date: Wed, 27 Nov 2024 18:54:53 +0100 +Subject: tests: Fix for ASAN + +The 'data' arrays in match and target expression tests were undersized +as they did not cover for the terminating NUL-char of the string used to +initialize them. When passing such array to strdup(), the latter reads +until after the defined array boundary. + +Fixes: 93483364369d8 ("src: get rid of cached copies of x_tables.h and xt_LOG.h") +Signed-off-by: Phil Sutter <[email protected]> +--- + tests/nft-expr_match-test.c | 2 +- + tests/nft-expr_target-test.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/nft-expr_match-test.c b/tests/nft-expr_match-test.c +index 53a8b84..bc9f6ac 100644 +--- a/tests/nft-expr_match-test.c ++++ b/tests/nft-expr_match-test.c +@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) + char buf[4096]; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; +- char data[16] = "0123456789abcdef"; ++ char data[] = "0123456789abcdef"; + + a = nftnl_rule_alloc(); + b = nftnl_rule_alloc(); +diff --git a/tests/nft-expr_target-test.c b/tests/nft-expr_target-test.c +index 89de945..a483e7a 100644 +--- a/tests/nft-expr_target-test.c ++++ b/tests/nft-expr_target-test.c +@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) + char buf[4096]; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; +- char data[16] = "0123456789abcdef"; ++ char data[] = "0123456789abcdef"; + + a = nftnl_rule_alloc(); + b = nftnl_rule_alloc(); +-- +cgit v1.2.3 diff --git a/net-libs/libnftnl/libnftnl-1.2.8.ebuild b/net-libs/libnftnl/libnftnl-1.2.8.ebuild index ec50cf89c560..382d2095c3b4 100644 --- a/net-libs/libnftnl/libnftnl-1.2.8.ebuild +++ b/net-libs/libnftnl/libnftnl-1.2.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,6 +35,10 @@ BDEPEND+=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-valgrind-tests.patch +) + pkg_setup() { if kernel_is ge 3 13; then CONFIG_CHECK="~NF_TABLES"
