From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Christian Borntraeger <borntraeger@de.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
syzbot+d889b59b2bb87d4047a2@syzkaller.appspotmail.com
Subject: [PATCH 2/2] KVM: s390: Return last valid slot if approx index is out-of-bounds
Date: Tue, 7 Apr 2020 23:40:59 -0700 [thread overview]
Message-ID: <20200408064059.8957-3-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20200408064059.8957-1-sean.j.christopherson@intel.com>
Return the index of the last valid slot from gfn_to_memslot_approx() if
its binary search loop yielded an out-of-bounds index. The index can
be out-of-bounds if the specified gfn is less than the base of the
lowest memslot (which is also the last valid memslot).
Note, the sole caller, kvm_s390_get_cmma(), ensures used_slots is
non-zero.
Fixes: afdad61615cc3 ("KVM: s390: Fix storage attributes migration with memory slots")
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/s390/kvm/kvm-s390.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 19a81024fe16..5dcf9ff12828 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -1939,6 +1939,9 @@ static int gfn_to_memslot_approx(struct kvm_memslots *slots, gfn_t gfn)
start = slot + 1;
}
+ if (start >= slots->used_slots)
+ return slots->used_slots - 1;
+
if (gfn >= memslots[start].base_gfn &&
gfn < memslots[start].base_gfn + memslots[start].npages) {
atomic_set(&slots->lru_slot, start);
--
2.24.1
next prev parent reply other threads:[~2020-04-08 6:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 6:40 [PATCH 0/2] KVM: Fix out-of-bounds memslot access Sean Christopherson
2020-04-08 6:40 ` [PATCH 1/2] KVM: Check validity of resolved slot when searching memslots Sean Christopherson
2020-04-08 7:04 ` Cornelia Huck
2020-04-08 6:40 ` Sean Christopherson [this message]
2020-04-08 7:10 ` [PATCH 2/2] KVM: s390: Return last valid slot if approx index is out-of-bounds Cornelia Huck
2020-04-08 9:08 ` Paolo Bonzini
2020-04-08 7:28 ` Christian Borntraeger
2020-04-08 10:21 ` Claudio Imbrenda
2020-04-08 11:33 ` Paolo Bonzini
2020-04-08 11:40 ` Christian Borntraeger
2020-04-08 6:55 ` [PATCH 0/2] KVM: Fix out-of-bounds memslot access Christian Borntraeger
2020-04-08 7:24 ` Christian Borntraeger
2020-04-08 8:10 ` Cornelia Huck
2020-04-08 14:23 ` Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200408064059.8957-3-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=syzbot+d889b59b2bb87d4047a2@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).