Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

intel_th: msu: Use memset_startat() for clearing hw header

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.

Acked-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Link: https://lore.kernel.org/lkml/87sfyzi97l.fsf@ashishki-desk.ger.corp.intel.com
Signed-off-by: Kees Cook <keescook@chromium.org>

+1 -3
+1 -3
drivers/hwtracing/intel_th/msu.c
··· 658 658 659 659 list_for_each_entry(win, &msc->win_list, entry) { 660 660 unsigned int blk; 661 - size_t hw_sz = sizeof(struct msc_block_desc) - 662 - offsetof(struct msc_block_desc, hw_tag); 663 661 664 662 for_each_sg(win->sgt->sgl, sg, win->nr_segs, blk) { 665 663 struct msc_block_desc *bdesc = sg_virt(sg); 666 664 667 - memset(&bdesc->hw_tag, 0, hw_sz); 665 + memset_startat(bdesc, 0, hw_tag); 668 666 } 669 667 } 670 668 }