virtio/virtio_mem: handle a possible NULL as a memcpy parameter

commit cf4a4493ff70874f8af26d75d4346c591c298e89 upstream.

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+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/virtio/virtio_mem.c b/drivers/virtio/virtio_mem.c
index bef8ad6bf4661bf6785c670401250f877c146486..4624a2c3d0553b8a0f18659a98c364834149127b 100644 (file)
--- a/drivers/virtio/virtio_mem.c
+++ b/drivers/virtio/virtio_mem.c
@@ -577,7 +577,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;