Commit 5c1ab40e authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Fix kasan splat in members_v1_get() 



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: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent fb3f57bb

fs/bcachefs/sb-members.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

	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)
@@ -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);

	unsigned i;



	if ((void *) members_v1_get_mut(mi, sb->nr_devices)  >

	    vstruct_end(&mi->field)) {

	if ((void *) members_v1_get_mut(mi, sb->nr_devices) > vstruct_end(&mi->field)) {

		prt_printf(err, "too many devices for section size");

		return -BCH_ERR_invalid_sb_members;

	}