|
Takashi Iwai |
9047cd |
From bb93ce4b150dde79f58e34103cbd1fe829796649 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
9047cd |
From: Longpeng <longpeng2@huawei.com>
|
|
Takashi Iwai |
9047cd |
Date: Wed, 24 Nov 2021 09:52:15 +0800
|
|
Takashi Iwai |
9047cd |
Subject: [PATCH] vdpa_sim: avoid putting an uninitialized iova_domain
|
|
Takashi Iwai |
9047cd |
Git-commit: bb93ce4b150dde79f58e34103cbd1fe829796649
|
|
Takashi Iwai |
9047cd |
Patch-mainline: v5.16-rc3
|
|
Takashi Iwai |
9047cd |
References: git-fixes
|
|
Takashi Iwai |
9047cd |
|
|
Takashi Iwai |
9047cd |
The system will crash if we put an uninitialized iova_domain, this
|
|
Takashi Iwai |
9047cd |
could happen when an error occurs before initializing the iova_domain
|
|
Takashi Iwai |
9047cd |
in vdpasim_create().
|
|
Takashi Iwai |
9047cd |
|
|
Takashi Iwai |
9047cd |
Bug: kernel NULL pointer dereference, address: 0000000000000000
|
|
Takashi Iwai |
9047cd |
...
|
|
Takashi Iwai |
9047cd |
Rip: 0010:__cpuhp_state_remove_instance+0x96/0x1c0
|
|
Takashi Iwai |
9047cd |
...
|
|
Takashi Iwai |
9047cd |
Call Trace:
|
|
Takashi Iwai |
9047cd |
<TASK>
|
|
Takashi Iwai |
9047cd |
put_iova_domain+0x29/0x220
|
|
Takashi Iwai |
9047cd |
vdpasim_free+0xd1/0x120 [vdpa_sim]
|
|
Takashi Iwai |
9047cd |
vdpa_release_dev+0x21/0x40 [vdpa]
|
|
Takashi Iwai |
9047cd |
device_release+0x33/0x90
|
|
Takashi Iwai |
9047cd |
kobject_release+0x63/0x160
|
|
Takashi Iwai |
9047cd |
vdpasim_create+0x127/0x2a0 [vdpa_sim]
|
|
Takashi Iwai |
9047cd |
vdpasim_net_dev_add+0x7d/0xfe [vdpa_sim_net]
|
|
Takashi Iwai |
9047cd |
vdpa_nl_cmd_dev_add_set_doit+0xe1/0x1a0 [vdpa]
|
|
Takashi Iwai |
9047cd |
genl_family_rcv_msg_doit+0x112/0x140
|
|
Takashi Iwai |
9047cd |
genl_rcv_msg+0xdf/0x1d0
|
|
Takashi Iwai |
9047cd |
...
|
|
Takashi Iwai |
9047cd |
|
|
Takashi Iwai |
9047cd |
So we must make sure the iova_domain is already initialized before
|
|
Takashi Iwai |
9047cd |
put it.
|
|
Takashi Iwai |
9047cd |
|
|
Takashi Iwai |
9047cd |
In addition, we may get the following warning in this case:
|
|
Takashi Iwai |
9047cd |
Warning: ... drivers/iommu/iova.c:344 iova_cache_put+0x58/0x70
|
|
Takashi Iwai |
9047cd |
|
|
Takashi Iwai |
9047cd |
So we must make sure the iova_cache_put() is invoked only if the
|
|
Takashi Iwai |
9047cd |
iova_cache_get() is already invoked. Let's fix it together.
|
|
Takashi Iwai |
9047cd |
|
|
Takashi Iwai |
9047cd |
Cc: stable@vger.kernel.org
|
|
Takashi Iwai |
9047cd |
Fixes: 4080fc106750 ("vdpa_sim: use iova module to allocate IOVA addresses")
|
|
Takashi Iwai |
9047cd |
Signed-off-by: Longpeng <longpeng2@huawei.com>
|
|
Takashi Iwai |
9047cd |
Acked-by: Jason Wang <jasowang@redhat.com>
|
|
Takashi Iwai |
9047cd |
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
Takashi Iwai |
9047cd |
Link: https://lore.kernel.org/r/20211124015215.119-1-longpeng2@huawei.com
|
|
Takashi Iwai |
9047cd |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Takashi Iwai |
9047cd |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
9047cd |
|
|
Takashi Iwai |
9047cd |
---
|
|
Takashi Iwai |
9047cd |
drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 +++++--
|
|
Takashi Iwai |
9047cd |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
Takashi Iwai |
9047cd |
|
|
Takashi Iwai |
9047cd |
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
|
|
Takashi Iwai |
9047cd |
index 5f484fff8dbe..41b0cd17fcba 100644
|
|
Takashi Iwai |
9047cd |
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
|
|
Takashi Iwai |
9047cd |
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
|
|
Takashi Iwai |
9047cd |
@@ -591,8 +591,11 @@ static void vdpasim_free(struct vdpa_device *vdpa)
|
|
Takashi Iwai |
9047cd |
vringh_kiov_cleanup(&vdpasim->vqs[i].in_iov);
|
|
Takashi Iwai |
9047cd |
}
|
|
Takashi Iwai |
9047cd |
|
|
Takashi Iwai |
9047cd |
- put_iova_domain(&vdpasim->iova);
|
|
Takashi Iwai |
9047cd |
- iova_cache_put();
|
|
Takashi Iwai |
9047cd |
+ if (vdpa_get_dma_dev(vdpa)) {
|
|
Takashi Iwai |
9047cd |
+ put_iova_domain(&vdpasim->iova);
|
|
Takashi Iwai |
9047cd |
+ iova_cache_put();
|
|
Takashi Iwai |
9047cd |
+ }
|
|
Takashi Iwai |
9047cd |
+
|
|
Takashi Iwai |
9047cd |
kvfree(vdpasim->buffer);
|
|
Takashi Iwai |
9047cd |
if (vdpasim->iommu)
|
|
Takashi Iwai |
9047cd |
vhost_iotlb_free(vdpasim->iommu);
|
|
Takashi Iwai |
9047cd |
--
|
|
Takashi Iwai |
9047cd |
2.35.3
|
|
Takashi Iwai |
9047cd |
|