From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EA72332EC1; Tue, 16 Jun 2026 17:38:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781631516; cv=none; b=Jy+D4LNU7RKdTXnRaQE71q9udk2v65e30xWMVk2nJ/xGH+QoOlP+l37jGpNwSqh9mfpki/SwwaKh0RYaIYZ7sr945/NpZFjJNTHRLP4CXgldSiPC0N0TN2KVuFgOJ8vXMgGyTKB/UhH4sWGVi8rJje5slzUEAqjvC3K/fY0Jf9U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781631516; c=relaxed/simple; bh=Ywj969vuwzjHqu+vzlVQxHz3fjtlQZIJpENQyS+FN88=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R9Z3KJPDbjSOhbGv0Qo6/t5iZrN7hWeO+Wo1S2LeIleVZKxtlMJ4tw5LcYstAFRFor4lEjb0vKS45wmIn2y+OqTGiOnc1CkTr/BWjmqGDShNgxZOuYMcEpDUr8uy4fnUXGeobz5hoQDjJJ7RQSnQWf5NjusdensJSx/1Al4Oprs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UeqnzGpn; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UeqnzGpn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 267371F000E9; Tue, 16 Jun 2026 17:38:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781631515; bh=r6Dhw8PQGL5DulqOJAprF/R1eRh36FRWPVaF4SKD8zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UeqnzGpnBRdqMfrrpM1HVVE64afPipskEtS2rI8guJeTXVKMHWJzI4T1VEBwoxCDR XFwd55fOPCXSqvhy5rXjKbi1VpDDtf5eDnFqNa/gxsCMlq5moukQCsI8kwbsHbxw/j b7ILXtgI1L4X1HVp+j1AGCUvSKm6QvBV3osdZ0Rc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xiang Mei , Weiming Shi , Dongli Zhang , Willem de Bruijn , Jakub Kicinski , Harshit Mogalapalli , Sasha Levin Subject: [PATCH 6.1 235/522] tap: free page on error paths in tap_get_user_xdp() Date: Tue, 16 Jun 2026 20:26:22 +0530 Message-ID: <20260616145136.979269206@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Weiming Shi [ Upstream commit 3bcf7aec6a9d16438f2cec29f5d7c8d5b8edf9b2 ] 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 Signed-off-by: Weiming Shi Reviewed-by: Dongli Zhang Reviewed-by: Willem de Bruijn Link: https://patch.msgid.link/20260521163230.1478627-2-bestswngs@gmail.com Signed-off-by: Jakub Kicinski (cherry picked from commit 3bcf7aec6a9d16438f2cec29f5d7c8d5b8edf9b2) Signed-off-by: Harshit Mogalapalli Signed-off-by: Sasha Levin --- drivers/net/tap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index f8e7b163810de6..15ab71f5288ac3 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -1157,6 +1157,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; } @@ -1166,6 +1167,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; } -- 2.53.0