Commit b2e2bed1 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Add missing key type checks to check_snapshot_exists() 



For now we only have one key type in these btrees, but forward
compatibility means we do have to check.

Reported-by: default avatar <syzbot+b4cb4a6988aced0cec4b@syzkaller.appspotmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 32a01cd4

fs/bcachefs/snapshot.c

+4 −2
Original line number Diff line number Diff line
@@ -871,7 +871,8 @@ static int check_snapshot_exists(struct btree_trans *trans, u32 id) 


	for_each_btree_key_norestart(trans, iter, BTREE_ID_snapshot_trees, POS_MIN,

				     0, k, ret) {

		if (le32_to_cpu(bkey_s_c_to_snapshot_tree(k).v->root_snapshot) == id) {

		if (k.k->type == KEY_TYPE_snapshot_tree &&

		    le32_to_cpu(bkey_s_c_to_snapshot_tree(k).v->root_snapshot) == id) {

			tree_id = k.k->p.offset;

			break;

		}
@@ -899,7 +900,8 @@ static int check_snapshot_exists(struct btree_trans *trans, u32 id) 


	for_each_btree_key_norestart(trans, iter, BTREE_ID_subvolumes, POS_MIN,

				     0, k, ret) {

		if (le32_to_cpu(bkey_s_c_to_subvolume(k).v->snapshot) == id) {

		if (k.k->type == KEY_TYPE_subvolume &&

		    le32_to_cpu(bkey_s_c_to_subvolume(k).v->snapshot) == id) {

			snapshot->v.subvol = cpu_to_le32(k.k->p.offset);

			SET_BCH_SNAPSHOT_SUBVOL(&snapshot->v, true);

			break;