Commit f09eca8d authored Jul 09, 2013 by Pablo Neira Ayuso

netfilter: ctnetlink: fix incorrect NAT expectation dumping



nf_ct_expect_alloc leaves unset the expectation NAT fields. However,
ctnetlink_exp_dump_expect expects them to be zeroed in case they are
not used, which may not be the case. This results in dumping the NAT
tuple of the expectation when it should not.

Fix it by zeroing the NAT fields of the expectation.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 63345b47

net/netfilter/nf_conntrack_expect.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -293,6 +293,11 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class,
		sizeof(exp->tuple.dst.u3) - len);

		exp->tuple.dst.u.all = *dst;

		#ifdef CONFIG_NF_NAT_NEEDED
		memset(&exp->saved_addr, 0, sizeof(exp->saved_addr));
		memset(&exp->saved_proto, 0, sizeof(exp->saved_proto));
		#endif
		}
		EXPORT_SYMBOL_GPL(nf_ct_expect_init);