btrfs: Use memset_startat() to clear end of struct

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.

Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Acked-by: David Sterba <dsterba@suse.com>
Signed-off-by: Kees Cook <keescook@chromium.org>

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 702dc5441f039743b4ad1cb99d10624084898705..12ceb14a114168946166c3be3f2ee7cdc96e5a43 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -39,10 +39,8 @@ static void btrfs_read_root_item(struct extent_buffer *eb, int slot,
                need_reset = 1;
        }
        if (need_reset) {
-               memset(&item->generation_v2, 0,
-                       sizeof(*item) - offsetof(struct btrfs_root_item,
-                                       generation_v2));
-
+               /* Clear all members from generation_v2 onwards. */
+               memset_startat(item, 0, generation_v2);
                generate_random_guid(item->uuid);
        }
 }