Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bcachefs: Fix kasan splat in members_v1_get()

Browse Source 
This fixes an incorrect memcpy() in the recent members_v2 code - a
members_v1 member is BCH_MEMBER_V1_BYTES, not sizeof(struct bch_member).

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2023-10-26 14:56:53 -04:00
parent fb3f57bb11
commit 5c1ab40e76
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/bcachefs/sb-members.c
View File

@ -36,7 +36,8 @@ static struct bch_member members_v1_get(struct bch_sb_field_members_v1 *mi, int
{ {
struct bch_member ret, *p = members_v1_get_mut(mi, i); struct bch_member ret, *p = members_v1_get_mut(mi, i);
memset(&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
memcpy(&ret, p, min_t(size_t, sizeof(struct bch_member), sizeof(ret))); return ret; memcpy(&ret, p, min_t(size_t, BCH_MEMBER_V1_BYTES, sizeof(ret)));
return ret;
} }
struct bch_member bch2_sb_member_get(struct bch_sb *sb, int i) struct bch_member bch2_sb_member_get(struct bch_sb *sb, int i)
@ -262,8 +263,7 @@ static int bch2_sb_members_v1_validate(struct bch_sb *sb,
struct bch_sb_field_members_v1 *mi = field_to_type(f, members_v1); struct bch_sb_field_members_v1 *mi = field_to_type(f, members_v1);
unsigned i; unsigned i;
if ((void *) members_v1_get_mut(mi, sb->nr_devices) > if ((void *) members_v1_get_mut(mi, sb->nr_devices) > vstruct_end(&mi->field)) {
vstruct_end(&mi->field)) {
prt_printf(err, "too many devices for section size"); prt_printf(err, "too many devices for section size");
return -BCH_ERR_invalid_sb_members; return -BCH_ERR_invalid_sb_members;
} }