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

Commit 22e7410b authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack: fix the race on assign helper to new conntrack 



The found helper cannot be assigned to conntrack after unlocking
nf_conntrack_lock. This tries to find helper to assign again.

Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dafc741c

net/netfilter/nf_conntrack_core.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -893,12 +893,6 @@ __nf_conntrack_alloc(const struct nf_conntrack_tuple *orig, 




	memset(conntrack, 0, nf_ct_cache[features].size);

	memset(conntrack, 0, nf_ct_cache[features].size);

	conntrack->features = features;

	conntrack->features = features;

	if (helper) {

		struct nf_conn_help *help = nfct_help(conntrack);

		NF_CT_ASSERT(help);

		help->helper = helper;

	}



	atomic_set(&conntrack->ct_general.use, 1);

	atomic_set(&conntrack->ct_general.use, 1);

	conntrack->ct_general.destroy = destroy_conntrack;

	conntrack->ct_general.destroy = destroy_conntrack;

	conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple = *orig;

	conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple = *orig;
@@ -982,8 +976,13 @@ init_conntrack(const struct nf_conntrack_tuple *tuple, 
#endif

#endif

		nf_conntrack_get(&conntrack->master->ct_general);

		nf_conntrack_get(&conntrack->master->ct_general);

		NF_CT_STAT_INC(expect_new);

		NF_CT_STAT_INC(expect_new);

	} else

	} else {

		struct nf_conn_help *help = nfct_help(conntrack);



		if (help)

			help->helper = __nf_ct_helper_find(&repl_tuple);

		NF_CT_STAT_INC(new);

		NF_CT_STAT_INC(new);

	}





	/* Overload tuple linked list to put us in unconfirmed list. */

	/* Overload tuple linked list to put us in unconfirmed list. */

	list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);

	list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);