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

Commit 468ec44b authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: conntrack: add '_get' to {ip, nf}_conntrack_expect_find 



We usually uses 'xxx_find_get' for function which increments
reference count.

Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent e4bd8bce

include/linux/netfilter_ipv4/ip_conntrack.h

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ extern struct ip_conntrack_expect * 
__ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);



extern struct ip_conntrack_expect *

ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple);

ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple);



extern struct ip_conntrack_tuple_hash *

__ip_conntrack_find(const struct ip_conntrack_tuple *tuple,

include/net/netfilter/nf_conntrack_expect.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct nf_conntrack_expect * 
__nf_conntrack_expect_find(const struct nf_conntrack_tuple *tuple);



struct nf_conntrack_expect *

nf_conntrack_expect_find(const struct nf_conntrack_tuple *tuple);

nf_conntrack_expect_find_get(const struct nf_conntrack_tuple *tuple);



struct nf_conntrack_expect *

find_expectation(const struct nf_conntrack_tuple *tuple);

net/ipv4/netfilter/ip_conntrack_core.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ __ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple) 


/* Just find a expectation corresponding to a tuple. */

struct ip_conntrack_expect *

ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple)

ip_conntrack_expect_find_get(const struct ip_conntrack_tuple *tuple)

{

	struct ip_conntrack_expect *i;

net/ipv4/netfilter/ip_conntrack_helper_pptp.c

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static void pptp_expectfn(struct ip_conntrack *ct, 
		DEBUGP("trying to unexpect other dir: ");

		DUMP_TUPLE(&inv_t);



		exp_other = ip_conntrack_expect_find(&inv_t);

		exp_other = ip_conntrack_expect_find_get(&inv_t);

		if (exp_other) {

			/* delete other expectation.  */

			DEBUGP("found\n");
@@ -176,7 +176,7 @@ static int destroy_sibling_or_exp(const struct ip_conntrack_tuple *t) 
		ip_conntrack_put(sibling);

		return 1;

	} else {

		exp = ip_conntrack_expect_find(t);

		exp = ip_conntrack_expect_find_get(t);

		if (exp) {

			DEBUGP("unexpect_related of expect %p\n", exp);

			ip_conntrack_unexpect_related(exp);

net/ipv4/netfilter/ip_conntrack_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ ctnetlink_get_expect(struct sock *ctnl, struct sk_buff *skb, 
	if (err < 0)

		return err;



	exp = ip_conntrack_expect_find(&tuple);

	exp = ip_conntrack_expect_find_get(&tuple);

	if (!exp)

		return -ENOENT;
@@ -1309,7 +1309,7 @@ ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb, 
			return err;



		/* bump usage count to 2 */

		exp = ip_conntrack_expect_find(&tuple);

		exp = ip_conntrack_expect_find_get(&tuple);

		if (!exp)

			return -ENOENT;