From: Kees Cook Date: Thu, 18 Nov 2021 20:30:19 +0000 (-0800) Subject: net: dccp: Use memset_startat() for TP zeroing X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f5455a1d9d499e4028b8ae8370758efad00b00e9;p=linux.git net: dccp: Use memset_startat() for TP zeroing 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() so memset() doesn't get confused about writing beyond the destination member that is intended to be the starting point of zeroing through the end of the struct. Signed-off-by: Kees Cook Signed-off-by: David S. Miller --- diff --git a/net/dccp/trace.h b/net/dccp/trace.h index 5062421beee9f..5a43b3508c7f1 100644 --- a/net/dccp/trace.h +++ b/net/dccp/trace.h @@ -60,9 +60,7 @@ TRACE_EVENT(dccp_probe, __entry->tx_t_ipi = hc->tx_t_ipi; } else { __entry->tx_s = 0; - memset(&__entry->tx_rtt, 0, (void *)&__entry->tx_t_ipi - - (void *)&__entry->tx_rtt + - sizeof(__entry->tx_t_ipi)); + memset_startat(__entry, 0, tx_rtt); } ),