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

Commit 49719eb3 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

[NETFILTER]: kill __ip_ct_expect_unlink_destroy 

The following patch kills __ip_ct_expect_unlink_destroy and export
unlink_expect as ip_ct_unlink_expect. As it was discussed [1], the function
__ip_ct_expect_unlink_destroy is a bit confusing so better do the following
sequence: ip_ct_destroy_expect and ip_conntrack_expect_put.

[1] https://lists.netfilter.org/pipermail/netfilter-devel/2005-August/020794.html



Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91c46e2e

include/linux/netfilter_ipv4/ip_conntrack_core.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static inline int ip_conntrack_confirm(struct sk_buff **pskb) 
	return ret;

}



extern void __ip_ct_expect_unlink_destroy(struct ip_conntrack_expect *exp);

extern void ip_ct_unlink_expect(struct ip_conntrack_expect *exp);



extern struct list_head *ip_conntrack_hash;

extern struct list_head ip_conntrack_expect_list;

net/ipv4/netfilter/ip_conntrack_core.c

+7 −13
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ ip_ct_invert_tuple(struct ip_conntrack_tuple *inverse, 




/* ip_conntrack_expect helper functions */

static void unlink_expect(struct ip_conntrack_expect *exp)

void ip_ct_unlink_expect(struct ip_conntrack_expect *exp)

{

	ASSERT_WRITE_LOCK(&ip_conntrack_lock);

	IP_NF_ASSERT(!timer_pending(&exp->timeout));
@@ -207,18 +207,12 @@ static void unlink_expect(struct ip_conntrack_expect *exp) 
	ip_conntrack_expect_put(exp);

}



void __ip_ct_expect_unlink_destroy(struct ip_conntrack_expect *exp)

{

	unlink_expect(exp);

	ip_conntrack_expect_put(exp);

}



static void expectation_timed_out(unsigned long ul_expect)

{

	struct ip_conntrack_expect *exp = (void *)ul_expect;



	write_lock_bh(&ip_conntrack_lock);

	unlink_expect(exp);

	ip_ct_unlink_expect(exp);

	write_unlock_bh(&ip_conntrack_lock);

	ip_conntrack_expect_put(exp);

}
@@ -269,7 +263,7 @@ find_expectation(const struct ip_conntrack_tuple *tuple) 
				atomic_inc(&i->use);

				return i;

			} else if (del_timer(&i->timeout)) {

				unlink_expect(i);

				ip_ct_unlink_expect(i);

				return i;

			}

		}
@@ -288,7 +282,7 @@ void ip_ct_remove_expectations(struct ip_conntrack *ct) 


	list_for_each_entry_safe(i, tmp, &ip_conntrack_expect_list, list) {

		if (i->master == ct && del_timer(&i->timeout)) {

			unlink_expect(i);

			ip_ct_unlink_expect(i);

			ip_conntrack_expect_put(i);

		}

	}
@@ -929,7 +923,7 @@ void ip_conntrack_unexpect_related(struct ip_conntrack_expect *exp) 
	/* choose the the oldest expectation to evict */

	list_for_each_entry_reverse(i, &ip_conntrack_expect_list, list) {

		if (expect_matches(i, exp) && del_timer(&i->timeout)) {

			unlink_expect(i);

			ip_ct_unlink_expect(i);

			write_unlock_bh(&ip_conntrack_lock);

			ip_conntrack_expect_put(i);

			return;
@@ -986,7 +980,7 @@ static void evict_oldest_expect(struct ip_conntrack *master) 
	list_for_each_entry_reverse(i, &ip_conntrack_expect_list, list) {

		if (i->master == master) {

			if (del_timer(&i->timeout)) {

				unlink_expect(i);

				ip_ct_unlink_expect(i);

				ip_conntrack_expect_put(i);

			}

			break;
@@ -1103,7 +1097,7 @@ void ip_conntrack_helper_unregister(struct ip_conntrack_helper *me) 
	/* Get rid of expectations */

	list_for_each_entry_safe(exp, tmp, &ip_conntrack_expect_list, list) {

		if (exp->master->helper == me && del_timer(&exp->timeout)) {

			unlink_expect(exp);

			ip_ct_unlink_expect(exp);

			ip_conntrack_expect_put(exp);

		}

	}

net/ipv4/netfilter/ip_conntrack_netlink.c

+8 −4
Original line number Diff line number Diff line
@@ -1349,8 +1349,10 @@ ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb, 
		list_for_each_entry_safe(exp, tmp, &ip_conntrack_expect_list,

					 list) {

			if (exp->master->helper == h 

			    && del_timer(&exp->timeout))

				__ip_ct_expect_unlink_destroy(exp);

			    && del_timer(&exp->timeout)) {

				ip_ct_unlink_expect(exp);

				ip_conntrack_expect_put(exp);

			}

		}

		write_unlock(&ip_conntrack_lock);

	} else {
@@ -1358,8 +1360,10 @@ ctnetlink_del_expect(struct sock *ctnl, struct sk_buff *skb, 
		write_lock_bh(&ip_conntrack_lock);

		list_for_each_entry_safe(exp, tmp, &ip_conntrack_expect_list,

					 list) {

			if (del_timer(&exp->timeout))

				__ip_ct_expect_unlink_destroy(exp);

			if (del_timer(&exp->timeout)) {

				ip_ct_unlink_expect(exp);

				ip_conntrack_expect_put(exp);

			}

		}

		write_unlock_bh(&ip_conntrack_lock);

	}

net/ipv4/netfilter/ip_conntrack_standalone.c

+1 −1
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ EXPORT_SYMBOL(ip_conntrack_expect_related); 
EXPORT_SYMBOL(ip_conntrack_unexpect_related);

EXPORT_SYMBOL_GPL(ip_conntrack_expect_list);

EXPORT_SYMBOL_GPL(__ip_conntrack_expect_find);

EXPORT_SYMBOL_GPL(__ip_ct_expect_unlink_destroy);

EXPORT_SYMBOL_GPL(ip_ct_unlink_expect);



EXPORT_SYMBOL(ip_conntrack_tuple_taken);

EXPORT_SYMBOL(ip_ct_gather_frags);