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

Commit 4e1d4e6c authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack_expect: avoid useless list walking 



Don't walk the list when unexpecting an expectation, we already
have a reference and the timer check is enough to guarantee
that it still is on the list.

This comment suggests that it was copied there by mistake from
expectation eviction:

/* choose the oldest expectation to evict */

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4156e8c

net/netfilter/nf_conntrack_expect.c

+3 −10
Original line number Diff line number Diff line
@@ -165,17 +165,10 @@ static inline int expect_matches(const struct nf_conntrack_expect *a, 
/* Generally a bad idea to call this: could have matched already. */

void nf_ct_unexpect_related(struct nf_conntrack_expect *exp)

{

	struct nf_conntrack_expect *i;



	write_lock_bh(&nf_conntrack_lock);

	/* choose the oldest expectation to evict */

	list_for_each_entry_reverse(i, &nf_ct_expect_list, list) {

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

			nf_ct_unlink_expect(i);

			write_unlock_bh(&nf_conntrack_lock);

			nf_ct_expect_put(i);

			return;

		}

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

		nf_ct_unlink_expect(exp);

		nf_ct_expect_put(exp);

	}

	write_unlock_bh(&nf_conntrack_lock);

}