Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbaff309 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm: warn on more invariant breakage 



Modifying a non-existent slot is not allowed.  Also check that the
first loop doesn't move a deleted slot beyond the used part of
the mslots array.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent efbeec70

virt/kvm/kvm_main.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -671,6 +671,7 @@ static void update_memslots(struct kvm_memslots *slots, 




	WARN_ON(mslots[i].id != id);

	WARN_ON(mslots[i].id != id);

	if (!new->npages) {

	if (!new->npages) {

		WARN_ON(!mslots[i].npages);

		new->base_gfn = 0;

		new->base_gfn = 0;

		if (mslots[i].npages)

		if (mslots[i].npages)

			slots->used_slots--;

			slots->used_slots--;
@@ -704,7 +705,8 @@ static void update_memslots(struct kvm_memslots *slots, 
			slots->id_to_index[mslots[i].id] = i;

			slots->id_to_index[mslots[i].id] = i;

			i--;

			i--;

		}

		}

	}

	} else

		WARN_ON_ONCE(i != slots->used_slots);





	mslots[i] = *new;

	mslots[i] = *new;

	slots->id_to_index[mslots[i].id] = i;

	slots->id_to_index[mslots[i].id] = i;