projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2b68224
)
virtio/virtio_mem: handle a possible NULL as a memcpy parameter
author
Peng Hao
<flyingpenghao@gmail.com>
Wed, 22 Dec 2021 01:12:25 +0000
(09:12 +0800)
committer
Michael S. Tsirkin
<mst@redhat.com>
Fri, 14 Jan 2022 23:50:53 +0000
(18:50 -0500)
There is a check for vm->sbm.sb_states before, and it should check
it here as well.
Signed-off-by: Peng Hao <flyingpeng@tencent.com>
Link:
https://lore.kernel.org/r/20211222011225.40573-1-flyingpeng@tencent.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Fixes:
5f1f79bbc9e2
("virtio-mem: Paravirtualized memory hotplug")
Cc: stable@vger.kernel.org # v5.8+
drivers/virtio/virtio_mem.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/virtio/virtio_mem.c
b/drivers/virtio/virtio_mem.c
index a6a78685cfbe8c1e8b29066b986b6a39f2d658ee..38becd8d578c72ef880c6e2aac545fa394d57c32 100644
(file)
--- a/
drivers/virtio/virtio_mem.c
+++ b/
drivers/virtio/virtio_mem.c
@@
-593,7
+593,7
@@
static int virtio_mem_sbm_sb_states_prepare_next_mb(struct virtio_mem *vm)
return -ENOMEM;
mutex_lock(&vm->hotplug_mutex);
- if (
new_bitmap
)
+ if (
vm->sbm.sb_states
)
memcpy(new_bitmap, vm->sbm.sb_states, old_pages * PAGE_SIZE);
old_bitmap = vm->sbm.sb_states;