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 B81833D091A; Tue, 16 Jun 2026 18:12:32 +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=1781633553; cv=none; b=BlObjp7lzNVV8M+I+TGCbyF4DchSEcJe/0ZUH/Nrj7+XhF9AJA/XF7JCHvxr8hwMDAmRsOCwnw5KdQ4p0qoC1feDgnAVexd1UP3qsd7nyE6m3qiLuMM8BvmOMWlUZv6b61yHp5rgXKYaP1lcn2T5LeC4isKAEq3tcFRmYPTwxP4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781633553; c=relaxed/simple; bh=+tu83gurt9S0lCRkR7JeG8XTMNotOW1Ec9U/Ro4ygak=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A2C109pEUTOzPWUYfLMCT+GYSLdo1CS2ky7T/CfWWSCEM619FmW2phUldSYCQ9z4d0GVy0AQ33L8/tEmeKL7CZxWYieN6VA+/tfN8+oExE7Ughcoj/Q8ntKv2ZnUl19kucOFPA5GF4kpsLhHIL8NkeAyvkf2NPxVrjqyIBNfVy8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SUZOgXuI; 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="SUZOgXuI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C28421F000E9; Tue, 16 Jun 2026 18:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781633552; bh=xira9+mLHShq68RF6cWR1YnL3htTgzCH9htwhWqBJlI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SUZOgXuIXgOLpTiuq1T3UiKO39EJnHGmqY9oIm7SzBON7vdwi139KpMRQf9paJjl0 TPD033+kGlv8Ys4ak3jTdC5PZz2dzbpmtfQbsR+ajW+yPPrmGaYkMYRvlRNU0ejyrR XlAAAV0Wi0/eMUUfy6dtFLxq+MPrBSphK84NQ7EE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lin Ma , Chenyuan Mi , Jingguo Tan , Sabrina Dubroca , Steffen Klassert Subject: [PATCH 5.15 101/411] xfrm: esp: restore combined single-frag length gate Date: Tue, 16 Jun 2026 20:25:39 +0530 Message-ID: <20260616145105.606905683@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145100.376842714@linuxfoundation.org> References: <20260616145100.376842714@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jingguo Tan commit dfa0d7b0ff1eb6b2c416b8fdb9b4f2cefba57a40 upstream. The ESP out-of-place fast path appends the trailer in esp_output_head() before esp_output_tail() allocates the destination page frag. The head-side gate currently checks skb->data_len and tailen separately, but the tail code allocates a single destination frag from the combined post-trailer skb->data_len. Reject the page-frag fast path when the combined aligned length exceeds a page. Otherwise skb_page_frag_refill() may fall back to a single page while the destination sg still spans the combined skb->data_len. Restore this combined-length page gate for both IPv4 and IPv6. Fixes: 5bd8baab087d ("esp: limit skb_page_frag_refill use to a single page") Cc: stable@vger.kernel.org Signed-off-by: Lin Ma Signed-off-by: Chenyuan Mi Signed-off-by: Jingguo Tan Reviewed-by: Sabrina Dubroca Signed-off-by: Steffen Klassert Signed-off-by: Greg Kroah-Hartman --- net/ipv4/esp4.c | 4 ++-- net/ipv6/esp6.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c @@ -459,8 +459,8 @@ int esp_output_head(struct xfrm_state *x return err; } - if (ALIGN(tailen, L1_CACHE_BYTES) > PAGE_SIZE || - ALIGN(skb->data_len, L1_CACHE_BYTES) > PAGE_SIZE) + if (ALIGN(skb->data_len + tailen, L1_CACHE_BYTES) > + PAGE_SIZE) goto cow; if (!skb_cloned(skb)) { --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -495,8 +495,8 @@ int esp6_output_head(struct xfrm_state * return err; } - if (ALIGN(tailen, L1_CACHE_BYTES) > PAGE_SIZE || - ALIGN(skb->data_len, L1_CACHE_BYTES) > PAGE_SIZE) + if (ALIGN(skb->data_len + tailen, L1_CACHE_BYTES) > + PAGE_SIZE) goto cow; if (!skb_cloned(skb)) {