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 8EB105F54E; Tue, 13 Feb 2024 17:29:20 +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=1707845360; cv=none; b=GITRgAwLhG6fYVUWCmf1/G2tsdxWAWIljKh9H5/zKMzUR/sbftLcb2Ar6Lsy/ZC4MfF8WWrRh7KiHZCXpC2zKayOxxTyD+en/KgMQHiQE4JFvDAIwTKN0cnz4XFc0vVqkYARRXkhdHydWPzEn0VQ/r1g6GwSY73wSDu+RZP6iik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707845360; c=relaxed/simple; bh=ncIRK+/s4mJ/gQKbU5TnV6SzvK8m9pFurqJTsXs+nj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mMUvJ0qqwZQBlyv34Xd+nrbnps7MwiEijTvu96F9oSm9D8oJjvyOh7XNWDbCSeS60ym1/CtOeIPoZLjjbwkf1clj4/UdfvJrxk6Y+o2pFsrPK5VT49SpS5ZbWsEmk0zYCBDfw5mWVdxYdLPMNhi5DT+CirpNBKoBuSKHjNAvDGI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DilIjqsr; 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="DilIjqsr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E90EFC433F1; Tue, 13 Feb 2024 17:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1707845360; bh=ncIRK+/s4mJ/gQKbU5TnV6SzvK8m9pFurqJTsXs+nj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DilIjqsrsvjpm8hidxpNtLMu/yDyz9N+TrDSHESyjkClSd4x6Lgi2AaTnK+zWWN+E z0PHJ3BjbLRnUeZKJP9Hr2A9JJkvn1WMzSHvMjrEWPFWResdoBPhBVMrGNS5ElNxMO RxBiIZgbQKj3eNbTmA7Nf9ADFq0GPc/2+Mr3Oc4s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Antoine Tenart , Jiri Pirko , "David S. Miller" , Sasha Levin Subject: [PATCH 6.6 057/121] tunnels: fix out of bounds access when building IPv6 PMTU error Date: Tue, 13 Feb 2024 18:21:06 +0100 Message-ID: <20240213171854.659620947@linuxfoundation.org> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240213171852.948844634@linuxfoundation.org> References: <20240213171852.948844634@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Antoine Tenart [ Upstream commit d75abeec401f8c86b470e7028a13fcdc87e5dd06 ] If the ICMPv6 error is built from a non-linear skb we get the following splat, BUG: KASAN: slab-out-of-bounds in do_csum+0x220/0x240 Read of size 4 at addr ffff88811d402c80 by task netperf/820 CPU: 0 PID: 820 Comm: netperf Not tainted 6.8.0-rc1+ #543 ... kasan_report+0xd8/0x110 do_csum+0x220/0x240 csum_partial+0xc/0x20 skb_tunnel_check_pmtu+0xeb9/0x3280 vxlan_xmit_one+0x14c2/0x4080 vxlan_xmit+0xf61/0x5c00 dev_hard_start_xmit+0xfb/0x510 __dev_queue_xmit+0x7cd/0x32a0 br_dev_queue_push_xmit+0x39d/0x6a0 Use skb_checksum instead of csum_partial who cannot deal with non-linear SKBs. Fixes: 4cb47a8644cc ("tunnels: PMTU discovery support for directly bridged IP packets") Signed-off-by: Antoine Tenart Reviewed-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/ip_tunnel_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index 586b1b3e35b8..80ccd6661aa3 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -332,7 +332,7 @@ static int iptunnel_pmtud_build_icmpv6(struct sk_buff *skb, int mtu) }; skb_reset_network_header(skb); - csum = csum_partial(icmp6h, len, 0); + csum = skb_checksum(skb, skb_transport_offset(skb), len, 0); icmp6h->icmp6_cksum = csum_ipv6_magic(&nip6h->saddr, &nip6h->daddr, len, IPPROTO_ICMPV6, csum); -- 2.43.0