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 062B343B3C4; Mon, 17 Aug 2026 13:56:50 +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=1786975011; cv=none; b=hQJZFnES651I07YUBRQPabvqtR8gwCDrCTHge+mvctTet+kerae5t2CmsiN5VXA98b7dU03jCbVV+SyK+0dv4EPplWh+xhFhRysQ5QEXJAeAqvk6X01yI6T8udjUr5Y3YXBjVzJAVdiSwH6kFgmcvhdiqdEt1mwYO8TurGCG6Pk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786975011; c=relaxed/simple; bh=JfvbHyJdn7DdZPnOfnBMh9xGhVix4m1NBLpy/gRBP1M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qx7Dz2cGpXpo9PzuyiJEshcOhZ1D0k9zs1WDTpbkCmyQtBgV0O6kT0pAkmoXkYdSSfDGY18Pt8/Z/WwpwGM6y9Dry7jLD+Bco5P8Peil3VYyk3LPTJ/cNhOivPqOV9GdBtcj60xwbpdB5kzXk1UzEdf5WGprBWrxPDpgNR1cmGQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QKJh09ch; 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="QKJh09ch" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E8A41F000E9; Mon, 17 Aug 2026 13:56:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1786975009; bh=f0i+GrBxoifxi+xW/J3AQD0j5nEU57haUTOKrIaSlyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QKJh09ch+1PRw/2PpXdE1rDHrU7BqeClu9e9ujFyL8HXkkuLxpa63Lb96z/xq/bhu hp3YrMsXjTazwRooc99xyZ5syImZzvFCpYlZn8tnfhFgUrUYDbpLg6hBVSBTc54OGA GX2Dz8XRhS72vrKmuck4dtWA6A5kBkXRRF5+Rv1w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kyle Zeng , David Lee , Julian Anastasov , Pablo Neira Ayuso Subject: [PATCH 6.18 131/250] ipvs: clear IPv4 options after rebasing tunnel ICMP errors Date: Mon, 17 Aug 2026 15:31:32 +0200 Message-ID: <20260817132541.940585205@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817132536.466235697@linuxfoundation.org> References: <20260817132536.466235697@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kyle Zeng commit e0ba936287dfe9783426aac27e5fd76fe35b38c9 upstream. ip_vs_in_icmp() rebases an skb from the outer ICMP packet to the quoted original request before passing it to icmp_send(). However, IPCB(skb)->opt still describes the outer IPv4 header. A timestamp option in the outer header can therefore leave an offset that points into the quoted transport header after the rebase. __ip_options_echo() treats a byte at that stale location as the option length and copies it into the fixed-size option storage on the __icmp_send() stack, causing a stack out-of-bounds write. Clear the stale option metadata after resetting the network header. Keep the remaining control block fields, including the ingress interface used by the ICMP response path. Fixes: f2edb9f7706d ("ipvs: implement passive PMTUD for IPIP packets") Cc: stable@vger.kernel.org Assisted-by: Codex:gpt-5.6-sol Codex:gpt-5.5-cyber Signed-off-by: Kyle Zeng Co-developed-by: David Lee Signed-off-by: David Lee Acked-by: Julian Anastasov Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/ipvs/ip_vs_core.c | 1 + 1 file changed, 1 insertion(+) --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -1772,6 +1772,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, s if (pskb_pull(skb, offset2) == NULL) goto ignore_tunnel; skb_reset_network_header(skb); + memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); /* Ensure the IP header is present in headroom */ if (!pskb_may_pull(skb, hlen_orig)) goto ignore_tunnel;