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

Commit 5d78a849 authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: nf_nat: Clears helper private area when NATing 



Some helpers (eg. ftp) assume that private area in conntrack is
filled with zero. It should be cleared when helper is changed.

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 df293bbb

net/netfilter/nf_conntrack_core.c

+7 −2
Original line number Diff line number Diff line
@@ -888,8 +888,13 @@ void nf_conntrack_alter_reply(struct nf_conn *ct, 
	NF_CT_DUMP_TUPLE(newreply);



	ct->tuplehash[IP_CT_DIR_REPLY].tuple = *newreply;

	if (!ct->master && help && help->expecting == 0)

		help->helper = __nf_ct_helper_find(newreply);

	if (!ct->master && help && help->expecting == 0) {

		struct nf_conntrack_helper *helper;

		helper = __nf_ct_helper_find(newreply);

		if (helper)

			memset(&help->help, 0, sizeof(help->help));

		help->helper = helper;

	}

	write_unlock_bh(&nf_conntrack_lock);

}

EXPORT_SYMBOL_GPL(nf_conntrack_alter_reply);