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 A24C01CDA12; Tue, 27 Aug 2024 15:32:08 +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=1724772728; cv=none; b=Bcxf2DGLrz8pDS4MNOpLA4S2UkcYM44xj42Dqb4inkl7wmTe5Q4BApvi94f//CpNmWrcvaz+XVZLyVlrog48cyrbTYoJp5BBZusHMsrV7yMPz33IL5PAynkj6ic9FOU6WZwMP+vYcRrnEs0j9tSHPiTpCffvJ79rTWTWspLlKA8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724772728; c=relaxed/simple; bh=kIE21Nfgll4A2jmqdoii6I8kKHzuHvhbBr00zALZkP4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GXwG7Y4Z0W52bX4LmcHcRuK9sI7DzggcgIieEvlMiK+pauJDLLoPrMf20q24bJX9Y561s28mR7V+DqyBXSKja03vckVYLTZPHo4Cn9N0QRclISbisBTjIS+g+hs61hXN3rFMPig7JgOhDSKwMiFq/GLuMDrM0bIJ5a6B7weUGO8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Jzb5/j9B; 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="Jzb5/j9B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3C46C4DDFC; Tue, 27 Aug 2024 15:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724772728; bh=kIE21Nfgll4A2jmqdoii6I8kKHzuHvhbBr00zALZkP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jzb5/j9BRveNsJ5hHAUM+/MZ9zEcsHf0AHf4k3DpiQjsWs3KzDeaw3FihsismxyeV rH6qDD5ONAlbD5EmZ9CkKbeO1ksw97re8/Gj0aFJxsHM7WhR8vDx3hqfso1UcRI7gm DxgYBwEslEwx07DBmzaKyPpIClxNc8OZO/y002Us= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jason Wang , Andrew Melnychenko , "David S. Miller" Subject: [PATCH 6.1 300/321] udp: allow header check for dodgy GSO_UDP_L4 packets. Date: Tue, 27 Aug 2024 16:40:08 +0200 Message-ID: <20240827143849.676481831@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827143838.192435816@linuxfoundation.org> References: <20240827143838.192435816@linuxfoundation.org> User-Agent: quilt/0.67 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: Andrew Melnychenko commit 1fd54773c26787b9aea80e2f62c7d0780ea444d0 upstream. Allow UDP_L4 for robust packets. Signed-off-by: Jason Wang Signed-off-by: Andrew Melnychenko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/udp_offload.c | 3 ++- net/ipv6/udp_offload.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -387,7 +387,8 @@ static struct sk_buff *udp4_ufo_fragment if (!pskb_may_pull(skb, sizeof(struct udphdr))) goto out; - if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) + if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4 && + !skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) return __udp_gso_segment(skb, features, false); mss = skb_shinfo(skb)->gso_size; --- a/net/ipv6/udp_offload.c +++ b/net/ipv6/udp_offload.c @@ -42,7 +42,8 @@ static struct sk_buff *udp6_ufo_fragment if (!pskb_may_pull(skb, sizeof(struct udphdr))) goto out; - if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) + if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4 && + !skb_gso_ok(skb, features | NETIF_F_GSO_ROBUST)) return __udp_gso_segment(skb, features, true); mss = skb_shinfo(skb)->gso_size;