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

Commit ca6a5074 authored by Patrick McHardy's avatar Patrick McHardy
Browse files

[NETFILTER]: nf_conntrack_netlink: clean up NAT protocol parsing 



Move responsibility for setting the IP_NAT_RANGE_PROTO_SPECIFIED flag
to the NAT protocol, properly propagate errors and get rid of ugly
return value convention.

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

net/ipv4/netfilter/nf_nat_proto_common.c

+5 −13
Original line number Diff line number Diff line
@@ -105,24 +105,16 @@ EXPORT_SYMBOL_GPL(nf_nat_proto_nlattr_to_range); 
int nf_nat_proto_nlattr_to_range(struct nlattr *tb[],

				 struct nf_nat_range *range)

{

	int ret = 0;



	/* we have to return whether we actually parsed something or not */



	if (tb[CTA_PROTONAT_PORT_MIN]) {

		ret = 1;

		range->min.all = nla_get_be16(tb[CTA_PROTONAT_PORT_MIN]);

		range->max.all = range->min.tcp.port;

		range->flags |= IP_NAT_RANGE_PROTO_SPECIFIED;

	}



	if (!tb[CTA_PROTONAT_PORT_MAX]) {

		if (ret)

			range->max.all = range->min.all;

	} else {

		ret = 1;

	if (tb[CTA_PROTONAT_PORT_MAX]) {

		range->max.all = nla_get_be16(tb[CTA_PROTONAT_PORT_MAX]);

		range->flags |= IP_NAT_RANGE_PROTO_SPECIFIED;

	}



	return ret;

	return 0;

}

EXPORT_SYMBOL_GPL(nf_nat_proto_range_to_nlattr);

#endif

net/netfilter/nf_conntrack_netlink.c

+3 −12
Original line number Diff line number Diff line
@@ -705,19 +705,10 @@ static int nfnetlink_parse_nat_proto(struct nlattr *attr, 
		return err;



	npt = nf_nat_proto_find_get(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum);



	if (!npt->nlattr_to_range) {

	if (npt->nlattr_to_range)

		err = npt->nlattr_to_range(tb, range);

	nf_nat_proto_put(npt);

		return 0;

	}



	/* nlattr_to_range returns 1 if it parsed, 0 if not, neg. on error */

	if (npt->nlattr_to_range(tb, range) > 0)

		range->flags |= IP_NAT_RANGE_PROTO_SPECIFIED;



	nf_nat_proto_put(npt);



	return 0;

	return err;

}



static const struct nla_policy nat_nla_policy[CTA_NAT_MAX+1] = {