KVM: downgrade two BUG_ONs to WARN_ON_ONCE
[ Upstream commit 5f25e71e31
]
This is not an unrecoverable situation. Users of kvm_read_guest_offset_cached
and kvm_write_guest_offset_cached must expect the read/write to fail, and
therefore it is possible to just return early with an error value.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
4b65555a50
Коммит
54bf0b0d35
|
@ -3001,7 +3001,8 @@ int kvm_write_guest_offset_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
|
|||
int r;
|
||||
gpa_t gpa = ghc->gpa + offset;
|
||||
|
||||
BUG_ON(len + offset > ghc->len);
|
||||
if (WARN_ON_ONCE(len + offset > ghc->len))
|
||||
return -EINVAL;
|
||||
|
||||
if (slots->generation != ghc->generation) {
|
||||
if (__kvm_gfn_to_hva_cache_init(slots, ghc, ghc->gpa, ghc->len))
|
||||
|
@ -3038,7 +3039,8 @@ int kvm_read_guest_offset_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
|
|||
int r;
|
||||
gpa_t gpa = ghc->gpa + offset;
|
||||
|
||||
BUG_ON(len + offset > ghc->len);
|
||||
if (WARN_ON_ONCE(len + offset > ghc->len))
|
||||
return -EINVAL;
|
||||
|
||||
if (slots->generation != ghc->generation) {
|
||||
if (__kvm_gfn_to_hva_cache_init(slots, ghc, ghc->gpa, ghc->len))
|
||||
|
|
Загрузка…
Ссылка в новой задаче