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

Commit cd91566e authored by Florian Westphal's avatar Florian Westphal Committed by Patrick McHardy
Browse files

netfilter: ctnetlink: remove remaining module refcounting 



Convert the remaining refcount users.

As pointed out by Patrick McHardy, the protocols can be accessed safely using RCU.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 0269ea49

net/netfilter/nf_conntrack_netlink.c

+9 −6
Original line number Diff line number Diff line
@@ -599,7 +599,8 @@ ctnetlink_parse_tuple_ip(struct nlattr *attr, struct nf_conntrack_tuple *tuple) 


	nla_parse_nested(tb, CTA_IP_MAX, attr, NULL);



	l3proto = nf_ct_l3proto_find_get(tuple->src.l3num);

	rcu_read_lock();

	l3proto = __nf_ct_l3proto_find(tuple->src.l3num);



	if (likely(l3proto->nlattr_to_tuple)) {

		ret = nla_validate_nested(attr, CTA_IP_MAX,
@@ -608,7 +609,7 @@ ctnetlink_parse_tuple_ip(struct nlattr *attr, struct nf_conntrack_tuple *tuple) 
			ret = l3proto->nlattr_to_tuple(tb, tuple);

	}



	nf_ct_l3proto_put(l3proto);

	rcu_read_unlock();



	return ret;

}
@@ -633,7 +634,8 @@ ctnetlink_parse_tuple_proto(struct nlattr *attr, 
		return -EINVAL;

	tuple->dst.protonum = nla_get_u8(tb[CTA_PROTO_NUM]);



	l4proto = nf_ct_l4proto_find_get(tuple->src.l3num, tuple->dst.protonum);

	rcu_read_lock();

	l4proto = __nf_ct_l4proto_find(tuple->src.l3num, tuple->dst.protonum);



	if (likely(l4proto->nlattr_to_tuple)) {

		ret = nla_validate_nested(attr, CTA_PROTO_MAX,
@@ -642,7 +644,7 @@ ctnetlink_parse_tuple_proto(struct nlattr *attr, 
			ret = l4proto->nlattr_to_tuple(tb, tuple);

	}



	nf_ct_l4proto_put(l4proto);

	rcu_read_unlock();



	return ret;

}
@@ -989,10 +991,11 @@ ctnetlink_change_protoinfo(struct nf_conn *ct, struct nlattr *cda[]) 


	nla_parse_nested(tb, CTA_PROTOINFO_MAX, attr, NULL);



	l4proto = nf_ct_l4proto_find_get(nf_ct_l3num(ct), nf_ct_protonum(ct));

	rcu_read_lock();

	l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct));

	if (l4proto->from_nlattr)

		err = l4proto->from_nlattr(tb, ct);

	nf_ct_l4proto_put(l4proto);

	rcu_read_unlock();



	return err;

}