selftests: netfilter: Fix missing return values in conntrack_dump_flush

CKI Backport Bot · CKI Backport Bot · commit 8074ebee843d · 2025-01-15T09:52:54.000Z
JIRA: https://issues.redhat.com/browse/RHEL-74034 commit 041bd1e Author: guanjing <guanjing@cmss.chinamobile.com> Date: Fri Nov 8 16:13:58 2024 +0800 selftests: netfilter: Fix missing return values in conntrack_dump_flush Fix the bug of some functions were missing return values. Fixes: eff3c55 ("netfilter: ctnetlink: support filtering by zone") Signed-off-by: Guan Jing <guanjing@cmss.chinamobile.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com>
diff --git a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c b/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
@@ -43,6 +43,8 @@ static int build_cta_tuple_v4(struct nlmsghdr *nlh, int type,
 	mnl_attr_nest_end(nlh, nest_proto);
 
 	mnl_attr_nest_end(nlh, nest);
+
+	return 0;
 }
 
 static int build_cta_tuple_v6(struct nlmsghdr *nlh, int type,
@@ -71,6 +73,8 @@ static int build_cta_tuple_v6(struct nlmsghdr *nlh, int type,
 	mnl_attr_nest_end(nlh, nest_proto);
 
 	mnl_attr_nest_end(nlh, nest);
+
+	return 0;
 }
 
 static int build_cta_proto(struct nlmsghdr *nlh)
@@ -90,6 +94,8 @@ static int build_cta_proto(struct nlmsghdr *nlh)
 	mnl_attr_nest_end(nlh, nest_proto);
 
 	mnl_attr_nest_end(nlh, nest);
+
+	return 0;
 }
 
 static int conntrack_data_insert(struct mnl_socket *sock, struct nlmsghdr *nlh,

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ static int build_cta_tuple_v4(struct nlmsghdr *nlh, int type,`
`43`	`43`	`mnl_attr_nest_end(nlh, nest_proto);`
`44`	`44`
`45`	`45`	`mnl_attr_nest_end(nlh, nest);`
	`46`	`+`
	`47`	`+ return 0;`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`static int build_cta_tuple_v6(struct nlmsghdr *nlh, int type,`
`@@ -71,6 +73,8 @@ static int build_cta_tuple_v6(struct nlmsghdr *nlh, int type,`
`71`	`73`	`mnl_attr_nest_end(nlh, nest_proto);`
`72`	`74`
`73`	`75`	`mnl_attr_nest_end(nlh, nest);`
	`76`	`+`
	`77`	`+ return 0;`
`74`	`78`	`}`
`75`	`79`
`76`	`80`	`static int build_cta_proto(struct nlmsghdr *nlh)`
`@@ -90,6 +94,8 @@ static int build_cta_proto(struct nlmsghdr *nlh)`
`90`	`94`	`mnl_attr_nest_end(nlh, nest_proto);`
`91`	`95`
`92`	`96`	`mnl_attr_nest_end(nlh, nest);`
	`97`	`+`
	`98`	`+ return 0;`
`93`	`99`	`}`
`94`	`100`
`95`	`101`	`static int conntrack_data_insert(struct mnl_socket sock, struct nlmsghdr nlh,`