| Message ID | 20211118203019.1286474-1-keescook@chromium.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f5455a1d9d499e4028b8ae8370758efad00b00e9 |
| Headers | show |
| Series | net: dccp: Use memset_startat() for TP zeroing | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Thu, 18 Nov 2021 12:30:19 -0800 you wrote: > 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. > > [...] Here is the summary with links: - net: dccp: Use memset_startat() for TP zeroing https://git.kernel.org/netdev/net-next/c/f5455a1d9d49 You are awesome, thank you!
diff --git a/net/dccp/trace.h b/net/dccp/trace.h index 5062421beee9..5a43b3508c7f 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); } ),
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 <keescook@chromium.org> --- net/dccp/trace.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)