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

netfilter: ipset: Check IPSET_ATTR_PORT only once 



We do not need to check tb[IPSET_ATTR_PORT] != NULL before
retrieving port, as this attribute is known to exist due to
ip_set_attr_netorder() returning true only when attribute
exists and it is in network byte order.

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 8e55d2e5

net/netfilter/ipset/ip_set_hash_ipport.c

+2 −8
Original line number Diff line number Diff line
@@ -139,10 +139,7 @@ hash_ipport4_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (ret)

		return ret;



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);
@@ -309,10 +306,7 @@ hash_ipport6_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (ret)

		return ret;



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);

net/netfilter/ipset/ip_set_hash_ipportip.c

+2 −8
Original line number Diff line number Diff line
@@ -145,10 +145,7 @@ hash_ipportip4_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (ret)

		return ret;



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);
@@ -321,10 +318,7 @@ hash_ipportip6_uadt(struct ip_set *set, struct nlattr *tb[], 
	if (ret)

		return ret;



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);

net/netfilter/ipset/ip_set_hash_ipportnet.c

+2 −8
Original line number Diff line number Diff line
@@ -207,10 +207,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[], 
		e.cidr = cidr - 1;

	}



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);
@@ -469,10 +466,7 @@ hash_ipportnet6_uadt(struct ip_set *set, struct nlattr *tb[], 


	ip6_netmask(&e.ip2, e.cidr + 1);



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);

net/netfilter/ipset/ip_set_hash_netport.c

+2 −8
Original line number Diff line number Diff line
@@ -196,10 +196,7 @@ hash_netport4_uadt(struct ip_set *set, struct nlattr *tb[], 
		e.cidr = cidr - 1;

	}



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);
@@ -420,10 +417,7 @@ hash_netport6_uadt(struct ip_set *set, struct nlattr *tb[], 
	}

	ip6_netmask(&e.ip, e.cidr + 1);



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);

net/netfilter/ipset/ip_set_hash_netportnet.c

+2 −8
Original line number Diff line number Diff line
@@ -225,10 +225,7 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[], 
		e.cidr[1] = cidr;

	}



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);
@@ -505,10 +502,7 @@ hash_netportnet6_uadt(struct ip_set *set, struct nlattr *tb[], 
	ip6_netmask(&e.ip[0], e.cidr[0]);

	ip6_netmask(&e.ip[1], e.cidr[1]);



	if (tb[IPSET_ATTR_PORT])

	e.port = nla_get_be16(tb[IPSET_ATTR_PORT]);

	else

		return -IPSET_ERR_PROTOCOL;



	if (tb[IPSET_ATTR_PROTO]) {

		e.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);

CRA Git | Maintained and supported by SUSTech CRA and CCSE