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 3C44E4E36DC; Wed, 30 Sep 2026 16:42:43 +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=1790786564; cv=none; b=nHjZAzkn+Oo7ec3up2MRlcnPGWeatB0s09Vjf58pUF2isRnD+R+bzxd/gNy1sDLcbkjqVqq2pfl2z/0Lck2jgXN7AXvXjKy18WV3Vo1LCOpkA99SgcZzO0kegBiGhICJDPnRrQaK1CJHeGXpVoQ8WOrF6e4LXAuq2SWTcLZvDP4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790786564; c=relaxed/simple; bh=AnFjyRan+Sp6pO5BrBEwp/+dF4sqJ3SulFmGmVTMgpQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sr7eZNuhEWhok+LQnN4w+XZGYqiuxNWDlOZb0IE+k+uvUT4oU0kuteTtTvayFUZHB5J6HPku/QoXtcAr0Qr8p2+Cxj6xBtAFmfrDNS0QrjMwl//gP3dxwCtA4cS6LdpaQZc573qdQS8wfxOqUguKdlXnRiP2TG/b+y6jBELq9Q0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=V5gYpP0B; 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="V5gYpP0B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 952461F000FF; Wed, 30 Sep 2026 16:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790786563; bh=7IWPIg8Ckvv07n+SOita9PSPQBrJFSLxLkDUYVMJe6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=V5gYpP0BzVz5RDuVo7N47SoeFXOJdn97IBNI6BuqdYOeqBwsWLpO/lCzvc7W61qg7 dVvFPhyWtWWFhe47je1hAaPLfTZVVQW0kNeamiJDEaBbiiLfJp6F9vokSRUCJxnHNt euvnBS4eTqSLtAjobpBtZTKAA6f32/5vc9vzthCA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sanghyun Park , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 906/982] vxlan: use one headroom snapshot for neighbour replies Date: Wed, 30 Sep 2026 17:27:22 +0200 Message-ID: <20260930152436.200737574@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@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: Sanghyun Park [ Upstream commit 481506a756dcd828ef42391cb08f38d8d96d38fc ] vxlan_na_create() samples LL_RESERVED_SPACE() to size the reply skb and then samples it again to reserve headroom. A concurrent vxlan_changelink() can update needed_headroom between the two reads, creating a TOCTOU race. The second value can exceed the allocation and make the Ethernet header write out of bounds. The race is reproducible on the unpatched kernel. It occurred when vxlan_na_create() generated a neighbour reply while vxlan_changelink() changed the link headroom. KASAN caught a four-byte write two bytes beyond a 704-byte skbuff_small_head allocation. Snapshot the headroom once and use that value for both allocation and reservation. Fixes: 4b29dba9c085 ("vxlan: fix nonfunctional neigh_reduce()") Signed-off-by: Sanghyun Park Link: https://patch.msgid.link/20260918032842.502409-2-sanghyun.park.cnu@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/vxlan/vxlan_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/vxlan/vxlan_core.c b/drivers/net/vxlan/vxlan_core.c index 9327b38fb6fde..59b90864d0509 100644 --- a/drivers/net/vxlan/vxlan_core.c +++ b/drivers/net/vxlan/vxlan_core.c @@ -2000,13 +2000,15 @@ static struct sk_buff *vxlan_na_create(struct sk_buff *request, struct ipv6hdr *pip6; u8 *daddr; int na_olen = 8; /* opt hdr + ETH_ALEN for target */ + int headroom; int ns_olen; int i, len; if (dev == NULL || !pskb_may_pull(request, request->len)) return NULL; - len = LL_RESERVED_SPACE(dev) + sizeof(struct ipv6hdr) + + headroom = LL_RESERVED_SPACE(dev); + len = headroom + sizeof(struct ipv6hdr) + sizeof(*na) + na_olen + dev->needed_tailroom; reply = alloc_skb(len, GFP_ATOMIC); if (reply == NULL) @@ -2014,7 +2016,7 @@ static struct sk_buff *vxlan_na_create(struct sk_buff *request, reply->protocol = htons(ETH_P_IPV6); reply->dev = dev; - skb_reserve(reply, LL_RESERVED_SPACE(request->dev)); + skb_reserve(reply, headroom); skb_push(reply, sizeof(struct ethhdr)); skb_reset_mac_header(reply); -- 2.53.0