Commit 4be1dbb7 authored by Kees Cook's avatar Kees Cook Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: Use memset_startat() to zero struct nf_conn 



In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memset(), avoid intentionally writing across
neighboring fields.

Use memset_startat() to avoid confusing memset() about writing beyond
the target struct member.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent fc5e0352

net/netfilter/nf_conntrack_core.c

+1 −3
Original line number Diff line number Diff line
@@ -1562,9 +1562,7 @@ __nf_conntrack_alloc(struct net *net, 
	ct->status = 0;

	ct->timeout = 0;

	write_pnet(&ct->ct_net, net);

	memset(&ct->__nfct_init_offset, 0,

	       offsetof(struct nf_conn, proto) -

	       offsetof(struct nf_conn, __nfct_init_offset));

	memset_after(ct, 0, __nfct_init_offset);



	nf_ct_zone_add(ct, zone);