From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 764E6179A3; Fri, 24 Apr 2026 13:35:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777037724; cv=none; b=Aul6ik2PJ+qvN2NdfJGb1ot4yVdKnHiVRh8/8Je+eCtiKs5siltZ1qUlq+db/gNbir4FL3GhFkwUBgKELC+bUipDxLqGatrTCioZ58oBqm0ofelt+OlVUlwJ1avKRzfWBq93XpkRFCV/WARhcGndRzc516rMuZ14c+gdVshvcho= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777037724; c=relaxed/simple; bh=WrVM/XwGYBhp/Op+50ipoaHezSuEJcWF7XDhBDXvuxI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IB26gwIaiqeYgHziYD1WdyWk6u/NFKE9xwIim5RyPSlkeBrs37o4WhcmvtuUEGTl3kV5BYUT1KbClG64kH3RWYFd96qw8TphFypWfLuq+Cam9gfYa/0tIkyBvoceFPDU+wgwH/mosqvNNkvz2CzXxAMzaTjlPjcPJhTLyF5rBTE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=vpzzl0Bv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="vpzzl0Bv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B726C19425; Fri, 24 Apr 2026 13:35:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777037724; bh=WrVM/XwGYBhp/Op+50ipoaHezSuEJcWF7XDhBDXvuxI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vpzzl0BveWmZmqYv8L+Agge8wfhBOd1o0N2/WcaGFkgP30VWVxivJnqOOxRWS0KAx Jl1H/rIA0JODzzCyC02YDXBjS7R83stAbeGN9ynQevsVgMNAUDIYvR94Sko3ZFgQ2V 3DrJuxy0wGzNNFmRAAVmCe0JjNVqyI9bjOsRYs+c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Stanislav Fomichev , Maciej Fijalkowski , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 044/166] xsk: tighten UMEM headroom validation to account for tailroom and min frame Date: Fri, 24 Apr 2026 15:29:18 +0200 Message-ID: <20260424132542.077981997@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260424132532.812258529@linuxfoundation.org> References: <20260424132532.812258529@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maciej Fijalkowski [ Upstream commit a315e022a72d95ef5f1d4e58e903cb492b0ad931 ] The current headroom validation in xdp_umem_reg() could leave us with insufficient space dedicated to even receive minimum-sized ethernet frame. Furthermore if multi-buffer would come to play then skb_shared_info stored at the end of XSK frame would be corrupted. HW typically works with 128-aligned sizes so let us provide this value as bare minimum. Multi-buffer setting is known later in the configuration process so besides accounting for 128 bytes, let us also take care of tailroom space upfront. Reviewed-by: Björn Töpel Acked-by: Stanislav Fomichev Fixes: 99e3a236dd43 ("xsk: Add missing check on user supplied headroom size") Signed-off-by: Maciej Fijalkowski Link: https://patch.msgid.link/20260402154958.562179-2-maciej.fijalkowski@intel.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/xdp/xdp_umem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 06cead2b8e349..e3c3bab76a5d0 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -196,7 +196,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) if (!unaligned_chunks && chunks_rem) return -EINVAL; - if (headroom >= chunk_size - XDP_PACKET_HEADROOM) + if (headroom > chunk_size - XDP_PACKET_HEADROOM - + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) - 128) return -EINVAL; umem->size = size; -- 2.53.0