vdpa: Fix possible use-after-free for VirtQueueElement
PATCH 1/1 vdpa: Fix possible use-after-free for VirtQueueElement
In reply to Hawkins JiaweiQEMU uses vhost_handle_guest_kick() to forward guest's available buffers to the vdpa device in SVQ avail ring.
In vhost_handle_guest_kick(), a g_autofree elem is used to iterate through the available VirtQueueElements. This elem is then passed to svq->ops->avail_handler, specifically to the vhost_vdpa_net_handle_ctrl_avail(). If this handler fails to process the CVQ command, vhost_handle_guest_kick() regains ownership of the elem, and either frees it or requeues it.
Yet the problem is that, vhost_vdpa_net_handle_ctrl_avail() mistakenly frees the elem, even if it fails to forward the CVQ command to vdpa device. This can result in a use-after-free for the elem in vhost_handle_guest_kick().
This patch solves this problem by refactoring vhost_vdpa_net_handle_ctrl_avail() to only freeing the elem if it owns it.
--- net/vhost-vdpa.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
net/vhost-vdpa.c +10 -1
@@ -825,7 +825,16 @@ out:error_report ("Bad device CVQ written length" ); }vhost_svq_push_elem (svq, elem,MIN (in_len,sizeof (status))); -g_free (elem); +/* +* `elem` belongs to vhost_vdpa_net_handle_ctrl_avail() only when +* the function successfully forwards the CVQ command, indicated +* by a non-negative value of `dev_written`. Otherwise, it still +* belongs to SVQ. +* This function should only free the `elem` when it owns. +*/ +if (dev_written >=0 ) { +g_free (elem); + }return dev_written <0 ? dev_written :0 ; }
Signature · 1 line
2.25.1
cover vdpa: Fix possible use-after-free for VirtQueueElement
This patch fixes the problem that vhost_vdpa_net_handle_ctrl_avail() mistakenly frees the elem, even if it fails to forward the CVQ command to vdpa device. This can result in a use-after-free
TestStep
========
1. test the patch using vp-vdpa device
- For L0 guest, boot QEMU with virtio-net-pci net device with ctrl_vq
feature on, something like:
-device virtio-net-pci,rx_queue_size=256,tx_queue_size=256,
iommu_platform=on,ctrl_vq=on,...
- For L1 guest, apply the patch series, then apply an addtional
patch to make the vhost_vdpa_net_handle_ctrl_avail() fails to process the CVQ command as below:
net/vhost-vdpa.c +2 -1
@@ -797,7 +797,8 @@ static int vhost_vdpa_net_handle_ctrl_avail(VhostShadowVirtqueue *svq, dev_written =sizeof (status); *s->status =VIRTIO_NET_OK ; }else { - dev_written =vhost_vdpa_net_cvq_add (s, out.iov_len,sizeof (status)); +//dev_written = vhost_vdpa_net_cvq_add(s, out.iov_len, sizeof(status)); + dev_written = -EINVAL ;if (unlikely (dev_written <0 )) { goto out; }
start QEMU with vdpa device with svq mode and enable the ctrl_vq feature on, something like:
-netdev type=vhost-vdpa,x-svq=true,...
-device virtio-net-pci,ctrl_vq=on,...With this series, QEMU should not trigger any error or warning. Without this series, QEMU should fail with
"free(): double free detected in tcache 2".
Hawkins Jiawei (1):
vdpa: Fix possible use-after-free for VirtQueueElement
net/vhost-vdpa.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
Quoted 16 lines · Hawkins Jiawei
QEMU uses
vhost_handle_guest_kick()to forward guest's available buffers to the vdpa device in SVQ avail ring.In
vhost_handle_guest_kick(), ag_autofreeelemis used to iterate through the available VirtQueueElements. Thiselemis then passed tosvq->ops->avail_handler, specifically to thevhost_vdpa_net_handle_ctrl_avail(). If this handler fails to process the CVQ command,vhost_handle_guest_kick()regains ownership of theelem, and either frees it or requeues it.Yet the problem is that,
vhost_vdpa_net_handle_ctrl_avail()mistakenly frees theelem, even if it fails to forward the CVQ command to vdpa device. This can result in a use-after-free for theeleminvhost_handle_guest_kick().
Quoted 6 lines
This patch solves this problem by refactoring
vhost_vdpa_net_handle_ctrl_avail()to only freeing theelemif it owns it.Fixes bd907ae4b0 ("vdpa: manual forward CVQ buffers")Signed-off-by Hawkins Jiawei <[email protected]>
Good catch!
Quoted 29 lines
--- net/vhost-vdpa.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)net/vhost-vdpa.c +10
-2@@ -825,7 +825,16 @@ out:error_report ("Bad device CVQ written length" ); }vhost_svq_push_elem (svq, elem,MIN (in_len,sizeof (status))); -g_free (elem); +/* +* `elem` belongs to vhost_vdpa_net_handle_ctrl_avail() only when +* the function successfully forwards the CVQ command, indicated +* by a non-negative value of `dev_written`. Otherwise, it still +* belongs to SVQ. +* This function should only free the `elem` when it owns. +*/ +if (dev_written >=0 ) { +g_free (elem); + }return dev_written <0 ? dev_written :0 ; } --2.25.1