]> xenbits.xensource.com Git - people/jgross/linux.git/commitdiff
virtio_net: bugfix overflow inside xdp_linearize_page()
authorXuan Zhuo <xuanzhuo@linux.alibaba.com>
Fri, 14 Apr 2023 06:08:35 +0000 (14:08 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Apr 2023 07:08:15 +0000 (08:08 +0100)
Here we copy the data from the original buf to the new page. But we
not check that it may be overflow.

As long as the size received(including vnethdr) is greater than 3840
(PAGE_SIZE -VIRTIO_XDP_HEADROOM). Then the memcpy will overflow.

And this is completely possible, as long as the MTU is large, such
as 4096. In our test environment, this will cause crash. Since crash is
caused by the written memory, it is meaningless, so I do not include it.

Fixes: 72979a6c3590 ("virtio_net: xdp, add slowpath case for non contiguous buffers")
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c

index 2396c28c01221956c12d6b1611efc020ac76547d..ea1bd4bb326d1690c2b01ee0ef3179dc7674a411 100644 (file)
@@ -814,8 +814,13 @@ static struct page *xdp_linearize_page(struct receive_queue *rq,
                                       int page_off,
                                       unsigned int *len)
 {
-       struct page *page = alloc_page(GFP_ATOMIC);
+       int tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+       struct page *page;
+
+       if (page_off + *len + tailroom > PAGE_SIZE)
+               return NULL;
 
+       page = alloc_page(GFP_ATOMIC);
        if (!page)
                return NULL;
 
@@ -823,7 +828,6 @@ static struct page *xdp_linearize_page(struct receive_queue *rq,
        page_off += *len;
 
        while (--*num_buf) {
-               int tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
                unsigned int buflen;
                void *buf;
                int off;