Commit 88078506 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'nf-24-11-14' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf 

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains Netfilter fixes for net:

1) Update .gitignore in selftest to skip conntrack_reverse_clash,
   from Li Zhijian.

2) Fix conntrack_dump_flush return values, from Guan Jing.

3) syzbot found that ipset's bitmap type does not properly checks for
   bitmap's first ip, from Jeongjun Park.

* tag 'nf-24-11-14' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf:
  netfilter: ipset: add missing range check in bitmap_ip_uadt
  selftests: netfilter: Fix missing return values in conntrack_dump_flush
  selftests: netfilter: Add missing gitignore file
====================

Link: https://patch.msgid.link/20241114125723.82229-1-pablo@netfilter.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c53bf100 35f56c55

net/netfilter/ipset/ip_set_bitmap_ip.c

+2 −5
Original line number Diff line number Diff line
@@ -163,11 +163,8 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[], 
		ret = ip_set_get_hostipaddr4(tb[IPSET_ATTR_IP_TO], &ip_to);

		if (ret)

			return ret;

		if (ip > ip_to) {

		if (ip > ip_to)

			swap(ip, ip_to);

			if (ip < map->first_ip)

				return -IPSET_ERR_BITMAP_RANGE;

		}

	} else if (tb[IPSET_ATTR_CIDR]) {

		u8 cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]);
@@ -178,7 +175,7 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[], 
		ip_to = ip;

	}



	if (ip_to > map->last_ip)

	if (ip < map->first_ip || ip_to > map->last_ip)

		return -IPSET_ERR_BITMAP_RANGE;



	for (; !before(ip_to, ip); ip += map->hosts) {

tools/testing/selftests/net/netfilter/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ 
audit_logread

connect_close

conntrack_dump_flush

conntrack_reverse_clash

sctp_collision

nf_queue

tools/testing/selftests/net/netfilter/conntrack_dump_flush.c

+6 −0
Original line number Diff line number Diff line
@@ -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,