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

Commit 8da560ce authored by Patrick McHardy's avatar Patrick McHardy
Browse files

netfilter: ipset: use nla_parse_nested() 



Replace calls of the form:

nla_parse(tb, ATTR_MAX, nla_data(attr), nla_len(attr), policy)

by:

nla_parse_nested(tb, ATTR_MAX, attr, policy)

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent d956798d

net/netfilter/ipset/ip_set_core.c

+16 −26
Original line number Original line Diff line number Diff line
@@ -246,8 +246,7 @@ ip_set_get_ipaddr4(struct nlattr *nla, __be32 *ipaddr) 




	if (unlikely(!flag_nested(nla)))

	if (unlikely(!flag_nested(nla)))

		return -IPSET_ERR_PROTOCOL;

		return -IPSET_ERR_PROTOCOL;

	if (nla_parse(tb, IPSET_ATTR_IPADDR_MAX, nla_data(nla), nla_len(nla),

	if (nla_parse_nested(tb, IPSET_ATTR_IPADDR_MAX, nla, ipaddr_policy))

		      ipaddr_policy))

		return -IPSET_ERR_PROTOCOL;

		return -IPSET_ERR_PROTOCOL;

	if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_IPADDR_IPV4)))

	if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_IPADDR_IPV4)))

		return -IPSET_ERR_PROTOCOL;

		return -IPSET_ERR_PROTOCOL;
@@ -265,8 +264,7 @@ ip_set_get_ipaddr6(struct nlattr *nla, union nf_inet_addr *ipaddr) 
	if (unlikely(!flag_nested(nla)))

	if (unlikely(!flag_nested(nla)))

		return -IPSET_ERR_PROTOCOL;

		return -IPSET_ERR_PROTOCOL;





	if (nla_parse(tb, IPSET_ATTR_IPADDR_MAX, nla_data(nla), nla_len(nla),

	if (nla_parse_nested(tb, IPSET_ATTR_IPADDR_MAX, nla, ipaddr_policy))

		      ipaddr_policy))

		return -IPSET_ERR_PROTOCOL;

		return -IPSET_ERR_PROTOCOL;

	if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_IPADDR_IPV6)))

	if (unlikely(!ip_set_attr_netorder(tb, IPSET_ATTR_IPADDR_IPV6)))

		return -IPSET_ERR_PROTOCOL;

		return -IPSET_ERR_PROTOCOL;
@@ -666,9 +664,7 @@ ip_set_create(struct sock *ctnl, struct sk_buff *skb, 
	 * Without holding any locks, create private part.

	 * Without holding any locks, create private part.

	 */

	 */

	if (attr[IPSET_ATTR_DATA] &&

	if (attr[IPSET_ATTR_DATA] &&

	    nla_parse(tb, IPSET_ATTR_CREATE_MAX,

	    nla_parse_nested(tb, IPSET_ATTR_CREATE_MAX, attr[IPSET_ATTR_DATA],

	    	      nla_data(attr[IPSET_ATTR_DATA]),

	    	      nla_len(attr[IPSET_ATTR_DATA]),

			     set->type->create_policy)) {

			     set->type->create_policy)) {

	    	ret = -IPSET_ERR_PROTOCOL;

	    	ret = -IPSET_ERR_PROTOCOL;

	    	goto put_out;

	    	goto put_out;
@@ -1169,9 +1165,8 @@ ip_set_uadd(struct sock *ctnl, struct sk_buff *skb, 




	use_lineno = !!attr[IPSET_ATTR_LINENO];

	use_lineno = !!attr[IPSET_ATTR_LINENO];

	if (attr[IPSET_ATTR_DATA]) {

	if (attr[IPSET_ATTR_DATA]) {

		if (nla_parse(tb, IPSET_ATTR_ADT_MAX,

		if (nla_parse_nested(tb, IPSET_ATTR_ADT_MAX,

			      nla_data(attr[IPSET_ATTR_DATA]),

				     attr[IPSET_ATTR_DATA],

			      nla_len(attr[IPSET_ATTR_DATA]),

				     set->type->adt_policy))

				     set->type->adt_policy))

			return -IPSET_ERR_PROTOCOL;

			return -IPSET_ERR_PROTOCOL;

		ret = call_ad(skb, set, tb, IPSET_ADD, flags, use_lineno);

		ret = call_ad(skb, set, tb, IPSET_ADD, flags, use_lineno);
@@ -1182,8 +1177,7 @@ ip_set_uadd(struct sock *ctnl, struct sk_buff *skb, 
			memset(tb, 0, sizeof(tb));

			memset(tb, 0, sizeof(tb));

			if (nla_type(nla) != IPSET_ATTR_DATA ||

			if (nla_type(nla) != IPSET_ATTR_DATA ||

			    !flag_nested(nla) ||

			    !flag_nested(nla) ||

			    nla_parse(tb, IPSET_ATTR_ADT_MAX,

			    nla_parse_nested(tb, IPSET_ATTR_ADT_MAX, nla,

			    	      nla_data(nla), nla_len(nla),

					     set->type->adt_policy))

					     set->type->adt_policy))

				return -IPSET_ERR_PROTOCOL;

				return -IPSET_ERR_PROTOCOL;

			ret = call_ad(skb, set, tb, IPSET_ADD,

			ret = call_ad(skb, set, tb, IPSET_ADD,
@@ -1224,9 +1218,8 @@ ip_set_udel(struct sock *ctnl, struct sk_buff *skb, 




	use_lineno = !!attr[IPSET_ATTR_LINENO];

	use_lineno = !!attr[IPSET_ATTR_LINENO];

	if (attr[IPSET_ATTR_DATA]) {

	if (attr[IPSET_ATTR_DATA]) {

		if (nla_parse(tb, IPSET_ATTR_ADT_MAX,

		if (nla_parse_nested(tb, IPSET_ATTR_ADT_MAX,

			      nla_data(attr[IPSET_ATTR_DATA]),

				     attr[IPSET_ATTR_DATA],

			      nla_len(attr[IPSET_ATTR_DATA]),

				     set->type->adt_policy))

				     set->type->adt_policy))

			return -IPSET_ERR_PROTOCOL;

			return -IPSET_ERR_PROTOCOL;

		ret = call_ad(skb, set, tb, IPSET_DEL, flags, use_lineno);

		ret = call_ad(skb, set, tb, IPSET_DEL, flags, use_lineno);
@@ -1237,8 +1230,7 @@ ip_set_udel(struct sock *ctnl, struct sk_buff *skb, 
			memset(tb, 0, sizeof(*tb));

			memset(tb, 0, sizeof(*tb));

			if (nla_type(nla) != IPSET_ATTR_DATA ||

			if (nla_type(nla) != IPSET_ATTR_DATA ||

			    !flag_nested(nla) ||

			    !flag_nested(nla) ||

			    nla_parse(tb, IPSET_ATTR_ADT_MAX,

			    nla_parse_nested(tb, IPSET_ATTR_ADT_MAX, nla,

			    	      nla_data(nla), nla_len(nla),

					     set->type->adt_policy))

					     set->type->adt_policy))

				return -IPSET_ERR_PROTOCOL;

				return -IPSET_ERR_PROTOCOL;

			ret = call_ad(skb, set, tb, IPSET_DEL,

			ret = call_ad(skb, set, tb, IPSET_DEL,
@@ -1269,9 +1261,7 @@ ip_set_utest(struct sock *ctnl, struct sk_buff *skb, 
	if (set == NULL)

	if (set == NULL)

		return -ENOENT;

		return -ENOENT;





	if (nla_parse(tb, IPSET_ATTR_ADT_MAX,

	if (nla_parse_nested(tb, IPSET_ATTR_ADT_MAX, attr[IPSET_ATTR_DATA],

		      nla_data(attr[IPSET_ATTR_DATA]),

		      nla_len(attr[IPSET_ATTR_DATA]),

			     set->type->adt_policy))

			     set->type->adt_policy))

		return -IPSET_ERR_PROTOCOL;

		return -IPSET_ERR_PROTOCOL;