diff options
| author | Peter Maydell | 2020-01-03 18:18:08 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-01-03 18:18:08 +0100 |
| commit | f0dcfddecee8b860e015bb07d67cfcbdfbfd51d9 (patch) | |
| tree | 09baf0f916e8bc35178791d79ba21fe3e1a17232 /hw | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/seabios-20191220-pull-reque... (diff) | |
| parent | virtio-blk: fix out-of-bounds access to bitmap in notify_guest_bh (diff) | |
| download | qemu-f0dcfddecee8b860e015bb07d67cfcbdfbfd51d9.tar.gz qemu-f0dcfddecee8b860e015bb07d67cfcbdfbfd51d9.tar.xz qemu-f0dcfddecee8b860e015bb07d67cfcbdfbfd51d9.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
# gpg: Signature made Fri 20 Dec 2019 10:25:11 GMT
# gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
virtio-blk: fix out-of-bounds access to bitmap in notify_guest_bh
docs: fix rst syntax errors in unbuilt docs
virtio-blk: deprecate SCSI passthrough
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/dataplane/virtio-blk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 119906a5fe..1b52e8159c 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -67,7 +67,7 @@ static void notify_guest_bh(void *opaque) memset(s->batch_notify_vqs, 0, sizeof(bitmap)); for (j = 0; j < nvqs; j += BITS_PER_LONG) { - unsigned long bits = bitmap[j]; + unsigned long bits = bitmap[j / BITS_PER_LONG]; while (bits != 0) { unsigned i = j + ctzl(bits); |