Skip to content

Commit 67a11de

Browse files
fengidrigregkh
authored andcommitted
virtio-net: fix overflow inside virtnet_rq_alloc
[ Upstream commit 6aacd1484468361d1d04badfe75f264fa5314864 ] When the frag just got a page, then may lead to regression on VM. Specially if the sysctl net.core.high_order_alloc_disable value is 1, then the frag always get a page when do refill. Which could see reliable crashes or scp failure (scp a file 100M in size to VM). The issue is that the virtnet_rq_dma takes up 16 bytes at the beginning of a new frag. When the frag size is larger than PAGE_SIZE, everything is fine. However, if the frag is only one page and the total size of the buffer and virtnet_rq_dma is larger than one page, an overflow may occur. The commit f9dac92 ("virtio_ring: enable premapped mode whatever use_dma_api") introduced this problem. And we reverted some commits to fix this in last linux version. Now we try to enable it and fix this bug directly. Here, when the frag size is not enough, we reduce the buffer len to fix this problem. Reported-by: "Si-Wei Liu" <[email protected]> Tested-by: Darren Kenny <[email protected]> Signed-off-by: Xuan Zhuo <[email protected]> Acked-by: Jason Wang <[email protected]> Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 8a71e5b commit 67a11de

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

drivers/net/virtio_net.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -946,9 +946,6 @@ static void *virtnet_rq_alloc(struct receive_queue *rq, u32 size, gfp_t gfp)
946946
void *buf, *head;
947947
dma_addr_t addr;
948948

949-
if (unlikely(!skb_page_frag_refill(size, alloc_frag, gfp)))
950-
return NULL;
951-
952949
head = page_address(alloc_frag->page);
953950

954951
if (rq->do_dma) {
@@ -2443,6 +2440,9 @@ static int add_recvbuf_small(struct virtnet_info *vi, struct receive_queue *rq,
24432440
len = SKB_DATA_ALIGN(len) +
24442441
SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
24452442

2443+
if (unlikely(!skb_page_frag_refill(len, &rq->alloc_frag, gfp)))
2444+
return -ENOMEM;
2445+
24462446
buf = virtnet_rq_alloc(rq, len, gfp);
24472447
if (unlikely(!buf))
24482448
return -ENOMEM;
@@ -2545,6 +2545,12 @@ static int add_recvbuf_mergeable(struct virtnet_info *vi,
25452545
*/
25462546
len = get_mergeable_buf_len(rq, &rq->mrg_avg_pkt_len, room);
25472547

2548+
if (unlikely(!skb_page_frag_refill(len + room, alloc_frag, gfp)))
2549+
return -ENOMEM;
2550+
2551+
if (!alloc_frag->offset && len + room + sizeof(struct virtnet_rq_dma) > alloc_frag->size)
2552+
len -= sizeof(struct virtnet_rq_dma);
2553+
25482554
buf = virtnet_rq_alloc(rq, len + room, gfp);
25492555
if (unlikely(!buf))
25502556
return -ENOMEM;

0 commit comments

Comments
 (0)