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 453C737F729; Fri, 8 May 2026 07:24:44 +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=1778225084; cv=none; b=as1tmMeX83mH2cpwiXw3BGnjgu24QL7nKj8wTT1W0tdo9xRLIo7TjCWmGZWtCBSvGIIed0Q8YNIefr/SVzmTWZ9rlAhwEfWfX2/a9AorFii8IW0cDaPRHKU0QzIHzVFYYtaDCKsuYy1W/YVZnImJqdOTVlCprVe+h6byjr02hvI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778225084; c=relaxed/simple; bh=Sox6DiQErF3Ph4xlYcBHTZ6Wp+8YA42qFqdfufICnf8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lMWIM4Hn89ZK2x7dv7g3sxmIR83/OYHTEkkOLujDhcUiY0wO9f92/oViDF7uDjB3X6KXFi+/TjYEX++AwVAV7TxPmIgF7LMp8H1SeZDE9mWVOrhb2Lc2FTQhUeTnW1qpdb8z/OXq1dDhDOhwcN8WcetsqG3rIdNej7gHAiJL0EM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WWbMpRzW; 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="WWbMpRzW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74EF2C2BCB4; Fri, 8 May 2026 07:24:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778225083; bh=Sox6DiQErF3Ph4xlYcBHTZ6Wp+8YA42qFqdfufICnf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWbMpRzWfnl1mkq4qRLsunWeM2T3lLuB3U5jVi/2jkkEzsfF21sGTaKBHNr+W/hEv nMa2ez2oqKWw1F94wLaeExGM3C/615E9SzHpFxNHyr2nlN72AEjobUDAnbZFSWRhUt LgTzd8ll1YVGOvkxCZ68TqEj0f9HalmIK1WEK97E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, stable@vger.kernel.org Cc: lwn@lwn.net, jslaby@suse.cz, Greg Kroah-Hartman Subject: Re: Linux 6.12.87 Date: Fri, 8 May 2026 09:24:32 +0200 Message-ID: <2026050832-cause-dweller-47bd@gregkh> X-Mailer: git-send-email 2.54.0 In-Reply-To: <2026050832-remold-faceless-bed0@gregkh> References: <2026050832-remold-faceless-bed0@gregkh> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit diff --git a/Makefile b/Makefile index f5053b825039..e644f9a1fd5a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 12 -SUBLEVEL = 86 +SUBLEVEL = 87 EXTRAVERSION = NAME = Baby Opossum Posse diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index deea0b934d91..2f548900e238 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -872,7 +872,8 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) nfrags = 1; goto skip_cow; - } else if (!skb_has_frag_list(skb)) { + } else if (!skb_has_frag_list(skb) && + !skb_has_shared_frag(skb)) { nfrags = skb_shinfo(skb)->nr_frags; nfrags++; diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 0bda561aa8a8..ba51fc42531c 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1231,6 +1231,8 @@ static int __ip_append_data(struct sock *sk, if (err < 0) goto error; copy = err; + if (!(flags & MSG_NO_SHARED_FRAGS)) + skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG; wmem_alloc_delta += copy; } else if (!zc) { int i = skb_shinfo(skb)->nr_frags; diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 20c1149f0f0a..a797d5740d9b 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -914,7 +914,8 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) nfrags = 1; goto skip_cow; - } else if (!skb_has_frag_list(skb)) { + } else if (!skb_has_frag_list(skb) && + !skb_has_shared_frag(skb)) { nfrags = skb_shinfo(skb)->nr_frags; nfrags++; diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 0aedb20072ac..31021dc40e52 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1761,6 +1761,8 @@ static int __ip6_append_data(struct sock *sk, if (err < 0) goto error; copy = err; + if (!(flags & MSG_NO_SHARED_FRAGS)) + skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG; wmem_alloc_delta += copy; } else if (!zc) { int i = skb_shinfo(skb)->nr_frags;