Commit 8e55d2e5 authored by Sergey Popovich's avatar Sergey Popovich Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: Return ipset error instead of bool 



Statement ret = func1() || func2() returns 0 when both func1()
and func2() return 0, or 1 if func1() or func2() returns non-zero.

However in our case func1() and func2() returns error code on
failure, so it seems good to propagate such error codes, rather
than returning 1 in case of failure.

Signed-off-by: default avatarSergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 43ef29c9

net/netfilter/ipset/ip_set_bitmap_ip.c

+5 −2
Original line number Diff line number Diff line
@@ -149,8 +149,11 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



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

	      ip_set_get_extensions(set, tb, &ext);

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

	if (ret)

		return ret;



	ret = ip_set_get_extensions(set, tb, &ext);

	if (ret)

		return ret;

net/netfilter/ipset/ip_set_bitmap_ipmac.c

+5 −2
Original line number Diff line number Diff line
@@ -250,8 +250,11 @@ bitmap_ipmac_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



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

	      ip_set_get_extensions(set, tb, &ext);

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

	if (ret)

		return ret;



	ret = ip_set_get_extensions(set, tb, &ext);

	if (ret)

		return ret;

net/netfilter/ipset/ip_set_hash_ip.c

+10 −4
Original line number Diff line number Diff line
@@ -120,8 +120,11 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



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

	      ip_set_get_extensions(set, tb, &ext);

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

	if (ret)

		return ret;



	ret = ip_set_get_extensions(set, tb, &ext);

	if (ret)

		return ret;
@@ -258,8 +261,11 @@ hash_ip6_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



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

	      ip_set_get_extensions(set, tb, &ext);

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

	if (ret)

		return ret;



	ret = ip_set_get_extensions(set, tb, &ext);

	if (ret)

		return ret;

net/netfilter/ipset/ip_set_hash_ipmark.c

+10 −4
Original line number Diff line number Diff line
@@ -122,8 +122,11 @@ hash_ipmark4_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



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

	      ip_set_get_extensions(set, tb, &ext);

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

	if (ret)

		return ret;



	ret = ip_set_get_extensions(set, tb, &ext);

	if (ret)

		return ret;
@@ -255,8 +258,11 @@ hash_ipmark6_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



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

	      ip_set_get_extensions(set, tb, &ext);

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

	if (ret)

		return ret;



	ret = ip_set_get_extensions(set, tb, &ext);

	if (ret)

		return ret;

net/netfilter/ipset/ip_set_hash_ipport.c

+10 −4
Original line number Diff line number Diff line
@@ -131,8 +131,11 @@ hash_ipport4_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



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

	      ip_set_get_extensions(set, tb, &ext);

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

	if (ret)

		return ret;



	ret = ip_set_get_extensions(set, tb, &ext);

	if (ret)

		return ret;
@@ -298,8 +301,11 @@ hash_ipport6_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (tb[IPSET_ATTR_LINENO])

		*lineno = nla_get_u32(tb[IPSET_ATTR_LINENO]);



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

	      ip_set_get_extensions(set, tb, &ext);

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

	if (ret)

		return ret;



	ret = ip_set_get_extensions(set, tb, &ext);

	if (ret)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE