From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EF45313272 for ; Tue, 16 Jun 2026 10:49:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.65 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781606985; cv=none; b=HOCbWU2RM0uhOEnkwJu3w77w1oAhHSnpGBYjGYuDYIqTxlmmhgYrT23jk/DSNZaN1yFOFvPYilDDkms7KZ9iFmXz1rc686yKZutLXpOD0UgkTNx1Kbx4/89T1Lg9aYnMTSdZNo0TZJ/2QAgs31zcvPidTeIHZM7W84/RvQx/OE4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781606985; c=relaxed/simple; bh=BYiitEcXHhRh6eR+a46Lb8G8JNceCCN8CajnI0gLC0Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DSCnCxN9ARbEPCmpRxjThrbeB9M84UGdfp1gPBQG8xRd9O9SKVSiuAp/IOZGFwop6pbjDaiKf9+ofBiy64zlykktnWqgC1qZy9X0dvRGZlSTtSDjTgRlCUrtxop/B+Y5iIT/aOWOBHcXnsRFfDnRQRy7bn1PBqxg27hogEgdARU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lRg5j8EK; arc=none smtp.client-ip=209.85.218.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lRg5j8EK" Received: by mail-ej1-f65.google.com with SMTP id a640c23a62f3a-c03a466c96aso271627066b.3 for ; Tue, 16 Jun 2026 03:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781606983; x=1782211783; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cBInyREsNJJq2tfrHgYP7popCDV3FF08GB9ZJkZM/f8=; b=lRg5j8EK/J0Q7YIVnt+1Z5uIGPxPMXk7vzGCHnB3zeNrJd1sZ0vHLv1GynKb8dPV1e jN/JQtLI7cI52tPZLYYP/rWrCuQ3Jflv4TzTIBOfwgiU2hjG9Mk5nW8VrbsoxvdDxU1B vNRHUSJuQTgHCI/SKUcShALtz0+sEEZ42ZS7EowqGmsTt4R9tT3PWz/x+2dRxOa43jB+ ms13hQxUu73VSrbXbHRorBag0psb/u6f67jTauBVcKdQPIdtndvW1CyvVRik1yU5qmUg gxgw0E9RhgZmg1ikDrrYjjhVSeCeS20yiTm6GvtnlnHkX3BwvQC/hJRQgbhwJBMZikAV XjrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781606983; x=1782211783; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cBInyREsNJJq2tfrHgYP7popCDV3FF08GB9ZJkZM/f8=; b=aEQM+aX6TQTCjut268n8UQZJqLSJtUELPayyleR2CoxI70Sgug/1Ct3UOSjMYUbDpj xGxaC0byPA5dztlFPCY6SiWaNblMHTvWxPrhbUR/vNwdNZC9tuhAtJvszu1MWmEpyjoP Mt+lExRCRoOtYBmbLv88m428hSIuHBMhyBoYqvolY4H8258pDGW2DGc5lpPF3O+QdvSI zsd4tz3ivGRjT943nLsdAL6O+EagXgy/pAEutaXWFKF3qPv16ITOhfhUBQWOZyKKB0Hq jbLVNIJ33A1sgfG4I1OsTp6LXk62R7l3/HZD6My7nUdcXlzyGVLaVgmNgFhdMenfgBsv d/9w== X-Forwarded-Encrypted: i=1; AFNElJ/IZyQOqWsm3XXQcQ9HGchLG3imLjzJFjDiqppfdWwjGhNQyww9cEBWkViX2usJhQPkC8yaEEq4KdfM3pc=@vger.kernel.org X-Gm-Message-State: AOJu0YzsG8Qy/UKtdKPi00jhYDf9MsJWV5bMqT6vJ8x46Qa8nyu1vdAi AxXL82+hZol55/kCrnkJb2x1dqNyURbPMdDsdltqFVHwnp6eK601Ym17tUXhjOpHKnqWIA== X-Gm-Gg: Acq92OGtZDhHH7gNr5Egvb2e4gkWn8YEqKdnIcCd7yNEUTcqRq4j9KiTdUVkHvBLcmW IlqDVhu5BuIMftAgor8uYN1C+sR1IjuvROXQGxkSfqgQw9nfQTJegd+2MuAtVbeyKnvt8tv9NVf sWpUxjXwrKR0T/FZjQMRkMT1xWHA5ICSi9rk+rA+ktpPP6qVNXCC3QQSf/6rpIsCe17JL29xFXn g3urjQrljm/W3jpABcGFeMF/PlWx9QCdFQMPlzqLOYpslNOto6g10WnJya4NgYeHFf8aKVtOOnD IX6GXwO01zrR1UzbdGG/ahxdPFbWYZuXfgKVX43KXnuzXZ9bDdd7ckatW/1nFkbyzIfb3wtTyHN fGaF7cCEhBmeQq0eUdG19n8ppNKm4pOdXCFNYfgyToPP4GAmEu1K7aDt0Va2dO2gON8bPfSTMm0 Ix5kbR1JW5g5D5oj6cB6oX55GR+8aRicbth8pG54mpmU0pdAMDjSK1uwFImr+bPAMDu9oK X-Received: by 2002:ac2:59cf:0:b0:5aa:6c2f:2a20 with SMTP id 2adb3069b0e04-5ad427a8bf2mr621532e87.30.1781600513392; Tue, 16 Jun 2026 02:01:53 -0700 (PDT) Received: from cherrypc.astra-academy.ru (109-252-17-231.nat.spd-mgts.ru. [109.252.17.231]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5ad2e1715d4sm3301048e87.34.2026.06.16.02.01.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2026 02:01:52 -0700 (PDT) From: Nazar Kalashnikov To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: Nazar Kalashnikov , Willem de Bruijn , Jason Wang , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Dongli Zhang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Si-Wei Liu , Willem de Bruijn , lvc-project@linuxtesting.org, Xiang Mei , Weiming Shi Subject: [PATCH 5.10/5.15/6.1/6.6/6.12/6.18] tap: free page on error paths in tap_get_user_xdp() Date: Tue, 16 Jun 2026 12:02:01 +0300 Message-ID: <20260616090202.693916-1-nazarkalashnikov0@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Weiming Shi commit 3bcf7aec6a9d16438f2cec29f5d7c8d5b8edf9b2 upstream. 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 Signed-off-by: Nazar Kalashnikov --- Backport fix for CVE-2026-46320 drivers/net/tap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 6fd3b14273b3..b51ce7af1b20 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -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; } -- 2.47.3