From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795030563; b=Li0FGkhd9m9uvLcOatIBsi3n3oxPodCM3QVDNbj2nqDnMpjbzR/uKw4CqU8lxQjmkjeT OllDisa9NJUgWYoyd/cHcki7kxOAZy3LBymYzLTfcq9ZuF5+dtdFPOIK4/40MsBuEH2eh 0cHHtOx1PAsOYgy5MGERePKz4bz4cbhAIseh2PbjhlT3bdjcRRdgBk3bzSryIwWmoMYH2 LjOY+92tEASFP8aMV2M+vje6v8Zs8ZxnnN/wWe6zk6XNyuiQNVENI2efRfxOBYK5moFbs 4gWVQaLbx0hm5PUkhBiDzK08EL932f0x3CypBd9J0qtJnHDQWmfRmarJQjHzpYL+MUw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030563; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=zHvE9KbH3Iw9TtbLb/+3qqnX9VI3vbiKXCk3D/F8aMU=; b=plJ24LVngGLPevC63I557IrN0JZWwiW5wSBoruTapozmmFEYEmO7Il4qUO0oexRUt2KE u0ArhEgBCvru+aBib4GujdnpQmlMrbwHTXeRfOdEJXNznqR6ikm8x9y1rKiFF3wgi/yeM t+djj4z7ZYPA7QfINVkqkBPCnTTpvWZNUoND6Ta27EhN6FVKgGX3TydvHRT0jTuupc0iA 6faugBnlx96mR2d+ivViRNI18tJy7UV+gVapBEUcllJyjfVmYX4sBtBFnedd9NR7yv+4h UjfuUW73sBWYihN2FBq3+RE3fyGjJDoGAe9h1kdtqM0/UB2AUEVXnmRlzxMoAbvPuCQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LVxW7XeM; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 46328606FF7C; Wed, 18 Nov 2026 19:36:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LVxW7XeM Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CB401F000C4; Wed, 18 Nov 2026 19:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795030563; bh=zHvE9KbH3Iw9TtbLb/+3qqnX9VI3vbiKXCk3D/F8aMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LVxW7XeMBQCCb+2GTBpEXcaJzWu+mkXmrJ62RHo3fBT87P9/ghLI6u4ECje1z01k3 MWd+JFMgdYfaDcQYHS1+SgHC/jqwjV/DuOPv5XBEGgJMceD1RhHp4w9liAZFRIvO2w RHQljg8tXW96YKf9bhPrejIUDvnLFo8EGU7puqSU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Omar Ramadan , Eric Dumazet , Paolo Abeni , Sasha Levin Subject: [PATCH 6.12 0736/1756] amt: pull the AMT header behind the transport header in amt_parse_type() Date: Wed, 18 Nov 2026 15:47:43 +0100 Message-ID: <20261118150038.936922060@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Omar Ramadan [ Upstream commit eb0c18404c8943356f4aa164e5db9067b79ea93c ] A gateway's encap socket passes ICMP errors to amt_err_lookup(), which calls amt_parse_type() on the quoted datagram to see which AMT message failed. On that path skb->data points at the quoted IP header and the transport header at the quoted UDP header, and icmp_socket_deliver() only guarantees the quoted IP header plus 8 bytes, that is, up to the end of the UDP header. amt_parse_type() pulls sizeof(struct udphdr) + sizeof(struct amt_header) bytes from skb->data, which on this path stays inside the quoted IP header, and then reads the AMT header behind udp_hdr(skb). An ICMP error that quotes only the IP and UDP headers of a Request, the minimum RFC 792 asks for, therefore makes it read past the pulled data, and past the end of the packet when nothing follows. Pull up to the transport header plus the UDP and AMT headers, as vxlan_err_lookup() does. amt_rcv() is called with the transport header at skb->data, so the pull on the receive path does not change. Fixes: cbc21dc1cfe9 ("amt: add data plane of amt interface") Signed-off-by: Omar Ramadan Reviewed-by: Eric Dumazet Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20260928181557.85796-1-omar@blockcast.net Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/amt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/amt.c b/drivers/net/amt.c index 54199c3babccb..a4255eb000840 100644 --- a/drivers/net/amt.c +++ b/drivers/net/amt.c @@ -1284,8 +1284,12 @@ static int amt_parse_type(struct sk_buff *skb) { struct amt_header *amth; - if (!pskb_may_pull(skb, sizeof(struct udphdr) + - sizeof(struct amt_header))) + /* skb->data is the UDP header on receive, but the quoted IP header + * when amt_err_lookup() parses an ICMP error, so pull up to the + * transport header rather than from skb->data. + */ + if (!pskb_may_pull(skb, skb_transport_offset(skb) + + sizeof(struct udphdr) + sizeof(struct amt_header))) return -1; amth = (struct amt_header *)(udp_hdr(skb) + 1); -- 2.53.0