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 1A2B037C0F9; Fri, 8 May 2026 07:24:55 +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=1778225096; cv=none; b=XwVC+35pka3fZuTeYIh9ZeRUBl6moJYkXqdai9e8vARXVuOubir4SFWih50L6xnKYVl+Dyatuhqc1pFoRlH3W8zXFveERniopDZ8tm5b/yxCUA7bDKttYz//+Ktp5cB6qNkMtVhlmO63UAFhjUfwTEYyJ1Ia3ObtrBHCgM8iNbo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778225096; c=relaxed/simple; bh=Y35dsYx5QRaPayOKo9bsddAyFb1mMFMfkjc2HbIH3/8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H8Qp1DuZGVt659nYKeLc2MKKFw89sBln3Fz52YElkM0OyzyQg9YNGMJ66/BnHb9I26Xb/5qxZtybe6AD3BbvtOXtao7JVOp05xLfLxHYGVidBb7N5V0rI0Gpyk/iH0QGyX/2oSZKd5Yg4S6eGttYnoHvAuEpSvMODVgPaZcefFQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=QtJGSZOi; 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="QtJGSZOi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8B6DC2BCB0; Fri, 8 May 2026 07:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778225095; bh=Y35dsYx5QRaPayOKo9bsddAyFb1mMFMfkjc2HbIH3/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QtJGSZOil6dCHZxtNMnIzgjxdZQHT1mWhPlHmjWjSpGVIeI0JYbEIeLEHw9QB0Ed1 j9Yj66Lbh8VIoQiX2B3paAvtfHfVUDgOtmO5Canh+giAXIBspUW037v5tBlgjKBQMJ 999Rcp4g9JIr6NuuZLyJGKx8+yKAEXFt9qhA7toE= 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.18.28 Date: Fri, 8 May 2026 09:24:43 +0200 Message-ID: <2026050843-pessimist-nature-0412@gregkh> X-Mailer: git-send-email 2.54.0 In-Reply-To: <2026050843-unplowed-spinster-cfa8@gregkh> References: <2026050843-unplowed-spinster-cfa8@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 eb796fab3380..8d068587e6bd 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 18 -SUBLEVEL = 27 +SUBLEVEL = 28 EXTRAVERSION = NAME = Baby Opossum Posse diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c index 6dfc0bcdef65..6a5febbdbee4 100644 --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -873,7 +873,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 ff11d3a85a36..7c005263262f 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1233,6 +1233,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 9f75313734f8..9c06c5a1419d 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -915,7 +915,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 f904739e99b9..f5ca0267e770 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1777,6 +1777,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;