Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a212e08e authored by Sergey Popovich's avatar Sergey Popovich Committed by Jozsef Kadlecsik
Browse files

netfilter: ipset: Make sure we always return line number on batch 



Even if we return with generic IPSET_ERR_PROTOCOL it is good idea
to return line number if we called in batch mode.

Moreover we are not always exiting with IPSET_ERR_PROTOCOL. For
example hash:ip,port,net may return IPSET_ERR_HASH_RANGE_UNSUPPORTED
or IPSET_ERR_INVALID_CIDR.

Signed-off-by: default avatarSergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 2c227f27

net/netfilter/ipset/ip_set_bitmap_ip.c

+3 −3
Original line number Diff line number Diff line
@@ -138,12 +138,12 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[], 
	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	int ret = 0;



	if (unlikely(!tb[IPSET_ATTR_IP]))

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	if (unlikely(!tb[IPSET_ATTR_IP]))

		return -IPSET_ERR_PROTOCOL;



	ret = ip_set_get_hostipaddr4(tb[IPSET_ATTR_IP], &ip);

	if (ret)

		return ret;

net/netfilter/ipset/ip_set_bitmap_ipmac.c

+3 −3
Original line number Diff line number Diff line
@@ -239,12 +239,12 @@ bitmap_ipmac_uadt(struct ip_set *set, struct nlattr *tb[], 
	u32 ip = 0;

	int ret = 0;



	if (unlikely(!tb[IPSET_ATTR_IP]))

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	if (unlikely(!tb[IPSET_ATTR_IP]))

		return -IPSET_ERR_PROTOCOL;



	ret = ip_set_get_hostipaddr4(tb[IPSET_ATTR_IP], &ip);

	if (ret)

		return ret;

net/netfilter/ipset/ip_set_bitmap_port.c

+3 −3
Original line number Diff line number Diff line
@@ -136,13 +136,13 @@ bitmap_port_uadt(struct ip_set *set, struct nlattr *tb[], 
	u16 port_to;

	int ret = 0;



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_PORT) ||

		     !ip_set_optattr_netorder(tb, IPSET_ATTR_PORT_TO)))

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	port = ip_set_get_h16(tb[IPSET_ATTR_PORT]);

	if (port < map->first_port || port > map->last_port)

		return -IPSET_ERR_BITMAP_RANGE;

net/netfilter/ipset/ip_set_hash_ip.c

+6 −6
Original line number Diff line number Diff line
@@ -108,12 +108,12 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[], 
	u32 ip = 0, ip_to = 0, hosts;

	int ret = 0;



	if (unlikely(!tb[IPSET_ATTR_IP]))

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	if (unlikely(!tb[IPSET_ATTR_IP]))

		return -IPSET_ERR_PROTOCOL;



	ret = ip_set_get_hostipaddr4(tb[IPSET_ATTR_IP], &ip);

	if (ret)

		return ret;
@@ -240,6 +240,9 @@ hash_ip6_uadt(struct ip_set *set, struct nlattr *tb[], 
	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	int ret;



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	if (unlikely(!tb[IPSET_ATTR_IP]))

		return -IPSET_ERR_PROTOCOL;

	if (unlikely(tb[IPSET_ATTR_IP_TO]))
@@ -251,9 +254,6 @@ hash_ip6_uadt(struct ip_set *set, struct nlattr *tb[], 
			return -IPSET_ERR_INVALID_CIDR;

	}



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	ret = ip_set_get_ipaddr6(tb[IPSET_ATTR_IP], &e.ip);

	if (ret)

		return ret;

net/netfilter/ipset/ip_set_hash_ipmark.c

+6 −6
Original line number Diff line number Diff line
@@ -108,13 +108,13 @@ hash_ipmark4_uadt(struct ip_set *set, struct nlattr *tb[], 
	u32 ip, ip_to = 0;

	int ret;



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	if (unlikely(!tb[IPSET_ATTR_IP] ||

		     !ip_set_attr_netorder(tb, IPSET_ATTR_MARK)))

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	ret = ip_set_get_ipaddr4(tb[IPSET_ATTR_IP], &e.ip);

	if (ret)

		return ret;
@@ -234,6 +234,9 @@ hash_ipmark6_uadt(struct ip_set *set, struct nlattr *tb[], 
	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	int ret;



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	if (unlikely(!tb[IPSET_ATTR_IP] ||

		     !ip_set_attr_netorder(tb, IPSET_ATTR_MARK)))

		return -IPSET_ERR_PROTOCOL;
@@ -246,9 +249,6 @@ hash_ipmark6_uadt(struct ip_set *set, struct nlattr *tb[], 
			return -IPSET_ERR_INVALID_CIDR;

	}



	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



	ret = ip_set_get_ipaddr6(tb[IPSET_ATTR_IP], &e.ip);

	if (ret)

		return ret;