]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
tap: free page on error paths in tap_get_user_xdp()
authorWeiming Shi <bestswngs@gmail.com>
Thu, 21 May 2026 16:32:31 +0000 (09:32 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 22 May 2026 17:08:59 +0000 (10:08 -0700)
tap_get_user_xdp() rejects a frame shorter than ETH_HLEN with -EINVAL,
and returns -ENOMEM when build_skb() fails. Both paths jump to the err
label without freeing the page that vhost_net_build_xdp() allocated for
the frame. tap_sendmsg() discards the per-buffer return value and always
returns 0, so vhost_tx_batch() takes the success path and never frees
the page; each rejected frame in a batch leaks one page-frag chunk.

Free the page on both error paths, before the skb is built. This is the
tap counterpart of the same leak in tun_xdp_one().

Fixes: 0efac27791ee ("tap: accept an array of XDP buffs through sendmsg()")
Fixes: ed7f2afdd0e0 ("tap: add missing verification for short frame")
Reported-by: Xiang Mei <xmei5@asu.edu>
Signed-off-by: Weiming Shi <bestswngs@gmail.com>
Reviewed-by: Dongli Zhang <dongli.zhang@oracle.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20260521163230.1478627-2-bestswngs@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/tap.c

index a590e07ce0a98c7a795b82c3471a0b4446bebeed..fae115915c8eff0b1068ab3f8c8e99a5ad9d1e86 100644 (file)
@@ -1052,6 +1052,7 @@ static int tap_get_user_xdp(struct tap_queue *q, struct xdp_buff *xdp)
        int err, depth;
 
        if (unlikely(xdp->data_end - xdp->data < ETH_HLEN)) {
+               put_page(virt_to_head_page(xdp->data));
                err = -EINVAL;
                goto err;
        }
@@ -1061,6 +1062,7 @@ static int tap_get_user_xdp(struct tap_queue *q, struct xdp_buff *xdp)
 
        skb = build_skb(xdp->data_hard_start, buflen);
        if (!skb) {
+               put_page(virt_to_head_page(xdp->data));
                err = -ENOMEM;
                goto err;
        }