Unverified Commit 0945d3ef authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14297 netfilter: ipset: add missing range check in bitmap_ip_uadt 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2J6RNB4PNBFBKONR7MNRHOUYAXXBBEPW/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB9NOX 
 
Link:https://gitee.com/openeuler/kernel/pulls/14297

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 21eb7b92 7ce16226

net/netfilter/ipset/ip_set_bitmap_ip.c

+2 −5
Original line number Diff line number Diff line
@@ -166,11 +166,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]);
@@ -181,7 +178,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) {