Skip to content

Commit 0cfa199

Browse files
committed
intel_th: msu: Use memset_startat() for clearing hw header
Bugzilla: https://bugzilla.redhat.com/2159468 commit 9ed0a59 Author: Kees Cook <keescook@chromium.org> Date: Mon May 24 21:36:48 2021 -0700 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> Signed-off-by: Eric Chanudet <echanude@redhat.com>
1 parent 9025075 commit 0cfa199

File tree

1 file changed

+1
-3
lines changed
  • drivers/hwtracing/intel_th

1 file changed

+1
-3
lines changed

drivers/hwtracing/intel_th/msu.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -658,13 +658,11 @@ static void msc_buffer_clear_hw_header(struct msc *msc)
658658

659659
list_for_each_entry(win, &msc->win_list, entry) {
660660
unsigned int blk;
661-
size_t hw_sz = sizeof(struct msc_block_desc) -
662-
offsetof(struct msc_block_desc, hw_tag);
663661

664662
for_each_sg(win->sgt->sgl, sg, win->nr_segs, blk) {
665663
struct msc_block_desc *bdesc = sg_virt(sg);
666664

667-
memset(&bdesc->hw_tag, 0, hw_sz);
665+
memset_startat(bdesc, 0, hw_tag);
668666
}
669667
}
670668
}

0 commit comments

Comments
 (0)