Skip to contentSkip to conversation

virtio-net: fix map leaking on error during receive

PATCH In review Jason Wang 2 participants 3 messages Mar 8, 2022

lore
Share & tools
lore

Jason Wang

author
#0 lore raw

PATCH 1/1 virtio-net: fix map leaking on error during receive

Commit bedd7e93d0196 ("virtio-net: fix use after unmap/free for sg") tries to fix the use after free of the sg by caching the virtqueue elements in an array and unmap them at once after receiving the packets, But it forgot to unmap the cached elements on error which will lead to leaking of mapping and other unexpected results.

Fixing this by detaching the cached elements on error. This addresses CVE-2022-26353.

Fixes bedd7e93d0196 ("virtio-net: fix use after unmap/free for sg")
---
 hw/net/virtio-net.c | 1 +
 1 file changed, 1 insertion(+)
hw/net/virtio-net.c +1 -0
index cf8ab0f8af..65b61c836c 100644
@@ -1867,6 +1867,7 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
 
 err:
     for (j = 0; j < i; j++) {
+        virtqueue_detach_element(q->rx_vq, elems[j], lens[j]);
         g_free(elems[j]);
     }
 
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Jason Wang

Commit bedd7e93d0196 ("virtio-net: fix use after unmap/free for sg") tries to fix the use after free of the sg by caching the virtqueue elements in an array and unmap them at once after receiving the packets, But it forgot to unmap the cached elements on error which will lead to leaking of mapping and other unexpected results.

Fixing this by detaching the cached elements on error. This addresses CVE-2022-26353.

Pls use a tag:

Fixes CVE-2022-26353

Besides that

Feel free to merge.

Quoted 23 lines
Fixes bedd7e93d0196 ("virtio-net: fix use after unmap/free for sg")
---
 hw/net/virtio-net.c | 1 +
 1 file changed, 1 insertion(+)
hw/net/virtio-net.c +1 -0
index cf8ab0f8af..65b61c836c 100644
@@ -1867,6 +1867,7 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
 
 err:
     for (j = 0; j < i; j++) {
+        virtqueue_detach_element(q->rx_vq, elems[j], lens[j]);
         g_free(elems[j]);
     }
 
Signature · 1 line
2.25.1
author
#2 lore raw
Quoted 8 lines · Michael S. Tsirkin
Quoted 6 lines · Jason Wang

Commit bedd7e93d0196 ("virtio-net: fix use after unmap/free for sg") tries to fix the use after free of the sg by caching the virtqueue elements in an array and unmap them at once after receiving the packets, But it forgot to unmap the cached elements on error which will lead to leaking of mapping and other unexpected results.

Quoted 7 lines
Quoted 2 lines

Fixing this by detaching the cached elements on error. This addresses CVE-2022-26353.

Pls use a tag:

Fixes CVE-2022-26353

Will do.

Quoted 7 lines

Besides that

Feel free to merge.

Ok.

Thanks

Quoted 25 lines
Quoted 24 lines
Fixes bedd7e93d0196 ("virtio-net: fix use after unmap/free for sg")
---
 hw/net/virtio-net.c | 1 +
 1 file changed, 1 insertion(+)
hw/net/virtio-net.c +1 -1
index cf8ab0f8af..65b61c836c 100644
@@ -1867,6 +1867,7 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
 
 err:
     for (j = 0; j < i; j++) {
+        virtqueue_detach_element(q->rx_vq, elems[j], lens[j]);
         g_free(elems[j]);
     }
 
--

2.25.1