virtio-net: fixes for mergeable XDP receive path
Subsystems (6)
v2 cover virtio-net: fixes for mergeable XDP receive path
Hi everyone,
This series contains fixes for XDP receive path in virtio-net
- Patch 1: add a missing check for the received data length with our allocated buffer size in mergeable mode.
- Patch 2: remove a redundant truesize check with PAGE_SIZE in mergeable mode
- Patch 3: make the current repeated code use the check_mergeable_len to check for received data length in mergeable mode
Version 2 changes:
- Move the check_mergeable_len helper definition to the patch 1.
- Remove patch 4.
Thanks,
Quang Minh.
Bui Quang Minh (3):
virtio-net: ensure the received length does not exceed allocated size
virtio-net: remove redundant truesize check with PAGE_SIZE
virtio-net: use the check_mergeable_len helper
drivers/net/virtio_net.c | 75 ++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 33 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/3 virtio-net: ensure the received length does not exceed allocated size
In xdp_linearize_page, when reading the following buffers from the ring, we forget to check the received length with the true allocate size. This can lead to an out-of-bound read. This commit adds that missing check.
--- drivers/net/virtio_net.c | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-)
drivers/net/virtio_net.c +34 -4
@@ -778,6 +778,26 @@ static unsigned int mergeable_ctx_to_truesize(void *mrg_ctx)return (unsigned long )mrg_ctx & ((1 <<MRG_CTX_HEADER_SHIFT ) -1 ); } +static int check_mergeable_len (struct net_device *dev,void *mrg_ctx, +unsigned int len) +{ +unsigned int headroom, tailroom, room, truesize; + + truesize =mergeable_ctx_to_truesize (mrg_ctx); + headroom =mergeable_ctx_to_headroom (mrg_ctx); + tailroom = headroom ?sizeof (struct skb_shared_info ) :0 ; + room =SKB_DATA_ALIGN (headroom + tailroom); + +if (len > truesize - room) { +pr_debug ("%s: rx error: len %u exceeds truesize %lu\n" , + dev->name, len, (unsigned long )(truesize - room)); +DEV_STATS_INC (dev, rx_length_errors); +return -1 ; + } + +return 0 ; +} +static struct sk_buff *virtnet_build_skb (void *buf,unsigned int buflen,unsigned int headroom,unsigned int len)
@@ -1797,7 +1817,8 @@ static unsigned int virtnet_get_headroom(struct virtnet_info *vi)* across multiple buffers (num_buf > 1), and we make sure buffers * have enough headroom. */ -static struct page *xdp_linearize_page(struct receive_queue *rq, +static struct page *xdp_linearize_page(struct net_device *dev, + struct receive_queue *rq, int *num_buf, struct page *p, int offset,
@@ -1817,18 +1838,27 @@ static struct page *xdp_linearize_page(struct receive_queue *rq,memcpy (page_address (page) + page_off,page_address (p) + offset, *len); page_off += *len; +/* Only mergeable mode can go inside this while loop. In small mode, +* *num_buf == 1, so it cannot go inside. +*/ while (--*num_buf) {unsigned int buflen;void *buf; +void *ctx;int off; - buf =virtnet_rq_get_buf (rq, &buflen,NULL ); + buf =virtnet_rq_get_buf (rq, &buflen, &ctx);if (unlikely (!buf)) goto err_buf; p =virt_to_head_page (buf); off = buf -page_address (p); +if (check_mergeable_len (dev, ctx, buflen)) { +put_page (p); + goto err_buf; + } +/* guard against a misconfigured or uncooperative backend that * is sending packet larger than the MTU. */
@@ -1917,7 +1947,7 @@ static struct sk_buff *receive_small_xdp(struct net_device *dev, headroom = vi->hdr_len + header_offset; buflen =SKB_DATA_ALIGN (GOOD_PACKET_LEN + headroom) +SKB_DATA_ALIGN (sizeof (struct skb_shared_info )); - xdp_page =xdp_linearize_page (rq, &num_buf, page, + xdp_page =xdp_linearize_page (dev, rq, &num_buf, page, offset, header_offset, &tlen);if (!xdp_page)
@@ -2252,7 +2282,7 @@ static void *mergeable_xdp_get_buf(struct virtnet_info *vi,*/ if (!xdp_prog->aux->xdp_has_frags) {/* linearize data for XDP */ - xdp_page =xdp_linearize_page (rq, num_buf, + xdp_page =xdp_linearize_page (vi->dev, rq, num_buf, *page, offset,XDP_PACKET_HEADROOM , len);
Signature · 1 line
2.43.0
Re: [PATCH net v2 1/3] virtio-net: ensure the received length does not exceed allocated size
Quoted 8 lines · Bui Quang Minh
In
xdp_linearize_page, when reading the following buffers from the ring, we forget to check the received length with the true allocate size. This can lead to an out-of-bound read. This commit adds that missing check.Cc <[email protected]>Fixes 4941d472bf95 ("virtio-net: do not reset during XDP set")Signed-off-by Bui Quang Minh <[email protected]>
Thanks
PATCH v2 2/3 virtio-net: remove redundant truesize check with PAGE_SIZE
In reply to Bui Quang MinhThe truesize is guaranteed not to exceed PAGE_SIZE in get_mergeable_buf_len(). It is saved in mergeable context, which is not changeable by the host side, so the check in receive path is quite redundant.
--- drivers/net/virtio_net.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/virtio_net.c +3 -4
@@ -2157,9 +2157,9 @@ static int virtnet_build_xdp_buff_mrg(struct net_device *dev, {struct virtio_net_hdr_mrg_rxbuf *hdr = buf;unsigned int headroom, tailroom, room; -unsigned int truesize, cur_frag_size;struct skb_shared_info *shinfo;unsigned int xdp_frags_truesz =0 ; +unsigned int truesize;struct page *page;skb_frag_t *frag;int offset;
@@ -2207,9 +2207,8 @@ static int virtnet_build_xdp_buff_mrg(struct net_device *dev, tailroom = headroom ?sizeof (struct skb_shared_info ) :0 ; room =SKB_DATA_ALIGN (headroom + tailroom); - cur_frag_size = truesize; - xdp_frags_truesz += cur_frag_size; -if (unlikely (len > truesize - room || cur_frag_size >PAGE_SIZE )) { + xdp_frags_truesz += truesize; +if (unlikely (len > truesize - room)) {put_page (page);pr_debug ("%s: rx error: len %u exceeds truesize %lu\n" , dev->name, len, (unsigned long )(truesize - room));
Signature · 1 line
2.43.0
PATCH v2 3/3 virtio-net: use the check_mergeable_len helper
In reply to Bui Quang MinhReplace the current repeated code to check received length in mergeable mode with the new check_mergeable_len helper.
--- drivers/net/virtio_net.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-)
drivers/net/virtio_net.c +7 -27
@@ -2156,7 +2156,6 @@ static int virtnet_build_xdp_buff_mrg(struct net_device *dev, struct virtnet_rq_stats *stats) {struct virtio_net_hdr_mrg_rxbuf *hdr = buf; -unsigned int headroom, tailroom, room;struct skb_shared_info *shinfo;unsigned int xdp_frags_truesz =0 ;unsigned int truesize;
@@ -2202,20 +2201,14 @@ static int virtnet_build_xdp_buff_mrg(struct net_device *dev, page =virt_to_head_page (buf); offset = buf -page_address (page); - truesize =mergeable_ctx_to_truesize (ctx); - headroom =mergeable_ctx_to_headroom (ctx); - tailroom = headroom ?sizeof (struct skb_shared_info ) :0 ; - room =SKB_DATA_ALIGN (headroom + tailroom); - - xdp_frags_truesz += truesize; -if (unlikely (len > truesize - room)) { +if (check_mergeable_len (dev, ctx, len)) {put_page (page); -pr_debug ("%s: rx error: len %u exceeds truesize %lu\n" , - dev->name, len, (unsigned long )(truesize - room)); -DEV_STATS_INC (dev, rx_length_errors); goto err; } + truesize =mergeable_ctx_to_truesize (ctx); + xdp_frags_truesz += truesize; + frag = &shinfo->frags[shinfo->nr_frags++];skb_frag_fill_page_desc (frag, page, offset, len);if (page_is_pfmemalloc (page))
@@ -2429,18 +2422,12 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,struct sk_buff *head_skb, *curr_skb;unsigned int truesize =mergeable_ctx_to_truesize (ctx);unsigned int headroom =mergeable_ctx_to_headroom (ctx); -unsigned int tailroom = headroom ?sizeof (struct skb_shared_info ) :0 ; -unsigned int room =SKB_DATA_ALIGN (headroom + tailroom); head_skb =NULL ;u64_stats_add (&stats->bytes, len - vi->hdr_len); -if (unlikely (len > truesize - room)) { -pr_debug ("%s: rx error: len %u exceeds truesize %lu\n" , - dev->name, len, (unsigned long )(truesize - room)); -DEV_STATS_INC (dev, rx_length_errors); +if (check_mergeable_len (dev, ctx, len)) goto err_skb; - }if (unlikely (vi->xdp_enabled)) {struct bpf_prog *xdp_prog;
@@ -2475,17 +2462,10 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,u64_stats_add (&stats->bytes, len); page =virt_to_head_page (buf); - truesize =mergeable_ctx_to_truesize (ctx); - headroom =mergeable_ctx_to_headroom (ctx); - tailroom = headroom ?sizeof (struct skb_shared_info ) :0 ; - room =SKB_DATA_ALIGN (headroom + tailroom); -if (unlikely (len > truesize - room)) { -pr_debug ("%s: rx error: len %u exceeds truesize %lu\n" , - dev->name, len, (unsigned long )(truesize - room)); -DEV_STATS_INC (dev, rx_length_errors); +if (check_mergeable_len (dev, ctx, len)) goto err_skb; - } + truesize =mergeable_ctx_to_truesize (ctx); curr_skb =virtnet_skb_append_frag (head_skb, curr_skb, page, buf, len, truesize);if (!curr_skb)
Signature · 1 line
2.43.0
Re: [PATCH net v2 3/3] virtio-net: use the check_mergeable_len helper
Quoted 6 lines · Bui Quang Minh
Replace the current repeated code to check received length in mergeable mode with the new
check_mergeable_lenhelper.Signed-off-by Bui Quang Minh <[email protected]>---
Thanks
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 11 lines · On Mon, 30 Jun 2025 21:42:09 +0700 you wrote:
Hi everyone,
This series contains fixes for XDP receive path in virtio-net
- Patch 1: add a missing check for the received data length with our allocated buffer size in mergeable mode.
- Patch 2: remove a redundant truesize check withPAGE_SIZEin mergeable mode
- Patch 3: make the current repeated code use thecheck_mergeable_lento check for received data length in mergeable mode[...]
Here is the summary with links:
- [net,v2,1/3] virtio-net: ensure the received length does not exceed allocated size
https://git.kernel.org/netdev/net/c/315dbdd7cdf6 - [net,v2,2/3] virtio-net: remove redundant truesize check with PAGE_SIZE https://git.kernel.org/netdev/net/c/4be2193b3393 - [net,v2,3/3] virtio-net: use the check_mergeable_len helper https://git.kernel.org/netdev/net/c/7d4a119e4582
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html