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 B2C873E5EC0; Mon, 17 Aug 2026 14:47:07 +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=1786978028; cv=none; b=prvcn6oWGUsmwWhbjmRsA4um9+n31UVLIUjFNwuDXJtjQyDotkxEJcqS9JsjyJS1duvR93fz2D7yGJeO7h4ejnmpwakZ3v6KG+7FstlZCiwo/7cgiSF/W0suUkZDH7Hk14K1w0Ggf1rmkwm6UGRF31M9S8ZfEVMoi0MoPI/iYnU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786978028; c=relaxed/simple; bh=5LSJAbvfingZ1n8cj9ByeJtwv71Gp7jVZAAn0dybnHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IhVVo1bKV86uVMWGwI3MSP8nnqgH6L4s52MSsk37gNqGF9IjDKhjYieK7qbi/BlgP47JAnBHP+D/DvuMYNhKxAowCC5NPcBuPvVjnWYkT18rc9rALSqCNle1on+gIHguafljUk13kV3JzCGxjlmbU33teA56QWsB0eT2HWcj3yA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=L1h/u8Yf; 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="L1h/u8Yf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 186971F00A3D; Mon, 17 Aug 2026 14:47:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786978027; bh=vRbCZxhDSXKA4SeFiiohfU9nQoXq2L5bntR45mEH1Rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L1h/u8YfwkgYmUEATA48/F6Jc7R6rS8UQXacncJ7bBRUQDpwFihdmUxm3fQ5zaWA2 1zD+UjrLc7dacOSC1ziRbtlB2OdHqAQes7KlwtV/mPpPEj9ujMnrPoj3/jxWB4Vno8 5iOUAjsSrNgrEFjJe1MFjyYrpwLl58vyY9xnIk48= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, AutonomousCodeSecurity@microsoft.com, "Cen Zhang (Microsoft)" , Stanislav Fomichev , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 039/181] xsk: require at least 16 bytes of TX metadata Date: Mon, 17 Aug 2026 15:32:13 +0200 Message-ID: <20260817132536.913710153@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132535.394764707@linuxfoundation.org> References: <20260817132535.394764707@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-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Stanislav Fomichev [ Upstream commit 1bb30b181d9f0484e141f8411e15ed906d5c6780 ] AF_XDP accepts a TX metadata length as small as eight bytes, but every supported request needs the flags plus at least one eight-byte request field. Such short metadata also lets the kernel read beyond the registered area. Require 16 bytes rather than sizeof(struct xsk_tx_metadata) to preserve compatibility with applications that do not use launch-time metadata. Fixes: 341ac980eab9 ("xsk: Support tx_metadata_len") Reported-by: AutonomousCodeSecurity@microsoft.com Reported-by: Cen Zhang (Microsoft) Link: https://lore.kernel.org/netdev/20260720155210.34229-1-blbllhy@gmail.com/ Signed-off-by: Stanislav Fomichev Link: https://patch.msgid.link/20260727161959.885642-2-sdf@fomichev.me Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/xdp/xdp_umem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 9ec7bd948acc7..81ffda5501078 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -209,6 +209,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr) if (mr->flags & XDP_UMEM_TX_METADATA_LEN) { if (mr->tx_metadata_len >= 256 || mr->tx_metadata_len % 8) return -EINVAL; + if (mr->tx_metadata_len < 16) + return -EINVAL; umem->tx_metadata_len = mr->tx_metadata_len; } -- 2.53.0