[ciqlts9_2] Multiple patches tested (3 commits) by ciq-kernel-automation[bot] · Pull Request #1232 · ctrliq/kernel-src-tree

ciq-kernel-automation · 2026-05-14T05:05:10Z

Summary

This PR has been automatically created after successful completion of all CI stages.

Commit Message(s)

Revert "xfrm: esp: avoid in-place decrypt on shared skb frags"

This reverts commit bb274cc6f4e7d1bbc82408f875d5fa190f66fadd.

xfrm: esp: avoid in-place decrypt on shared skb frags

jira VULN-184830
cve CVE-2026-43284
commit-author Kuan-Ting Chen <h3xrabbit@gmail.com>
commit f4c50a4034e62ab75f1d5cdd191dd5f9c77fdff4
upstream-diff |
	While this kernel lacks MSG_SPLICE_PAGES, it still has udp_sendpage().
	Upstream didn't patch udp_sendpage() because sendpage was removed
	entirely in favor of MSG_SPLICE_PAGES. In this kernel, splice() can
	still attach a page cache page to an IPv4 datagram via sendpage.
	Therefore, udp_sendpage() must be patched instead.
        IPv6 does not have MSG_SPLICE_PAGES but the __ip_addend_data()
        path is exercisable in ipv6/esp6.c so we're including that
        block.

net: skbuff: propagate shared-frag marker through frag-transfer helpers

jira VULN-185346
cve CVE-2026-46300
commit-author Hyunwoo Kim <imv4bel@gmail.com>
commit -
commit-source https://lore.kernel.org/all/agW4vC0r8QOUKtRT@v4bel/
upstream-diff |
  The upstream v3 patch does not apply cleanly to 5.14 due to two
  code reorganization differences:
  1. skb_gro_receive_list() is in net/ipv4/udp_offload.c on 5.14,
     but was moved to net/core/gro.c in later kernels. The fix was
     applied to udp_offload.c instead.
  2. skb_shift() in net/core/skbuff.c uses manual skb->len/data_len
     adjustments on 5.14, whereas upstream uses skb_len_add(). The
     surrounding context differs, causing the hunk to fail. The fix
     was applied at the equivalent location.
  The actual code changes are identical to upstream.

Test Results

✅ Build Stage

Architecture	Build Time	Total Time
x86_64	23m 24s	24m 16s
aarch64	18m 18s	19m 1s

View build logs

✅ Boot Verification

Status: Passed (all architectures)
View boot logs

✅ Kernel Selftests

Architecture	Passed	Failed	Compared Against	Status
x86_64	173	25	ciqlts9_2	✅ No regressions
aarch64	141	27	ciqlts9_2	✅ No regressions

View kselftest logs

✅ LTP Results

Architecture	Passed	Failed	Compared Against	Status
x86_64	1439	81	ciqlts9_2	✅ No regressions
aarch64	1409	83	ciqlts9_2	✅ No regressions

View LTP logs

🤖 This PR was automatically generated by GitHub Actions
Run ID: 25864885315

This reverts commit bb274cc.

jira VULN-184830 cve CVE-2026-43284 commit-author Kuan-Ting Chen <h3xrabbit@gmail.com> commit f4c50a4 upstream-diff | While this kernel lacks MSG_SPLICE_PAGES, it still has udp_sendpage(). Upstream didn't patch udp_sendpage() because sendpage was removed entirely in favor of MSG_SPLICE_PAGES. In this kernel, splice() can still attach a page cache page to an IPv4 datagram via sendpage. Therefore, udp_sendpage() must be patched instead. IPv6 does not have MSG_SPLICE_PAGES but the __ip_addend_data() path is exercisable in ipv6/esp6.c so we're including that block. MSG_SPLICE_PAGES can attach pages from a pipe directly to an skb. TCP marks such skbs with SKBFL_SHARED_FRAG after skb_splice_from_iter(), so later paths that may modify packet data can first make a private copy. The IPv4/IPv6 datagram append paths did not set this flag when splicing pages into UDP skbs. That leaves an ESP-in-UDP packet made from shared pipe pages looking like an ordinary uncloned nonlinear skb. ESP input then takes the no-COW fast path for uncloned skbs without a frag_list and decrypts in place over data that is not owned privately by the skb. Mark IPv4/IPv6 datagram splice frags with SKBFL_SHARED_FRAG, matching TCP. Also make ESP input fall back to skb_cow_data() when the flag is present, so ESP does not decrypt externally backed frags in place. Private nonlinear skb frags still use the existing fast path. This intentionally does not change ESP output. In esp_output_head(), the path that appends the ESP trailer to existing skb tailroom without calling skb_cow_data() is not reachable for nonlinear skbs: skb_tailroom() returns zero when skb->data_len is nonzero, while ESP tailen is positive. Thus ESP output will either use the separate destination-frag path or fall back to skb_cow_data(). Fixes: cac2661 ("esp4: Avoid skb_cow_data whenever possible") Fixes: 03e2a30 ("esp6: Avoid skb_cow_data whenever possible") Fixes: 7da0dde ("ip, udp: Support MSG_SPLICE_PAGES") Fixes: 6d8192b ("ip6, udp6: Support MSG_SPLICE_PAGES") Reported-by: Hyunwoo Kim <imv4bel@gmail.com> Reported-by: Kuan-Ting Chen <h3xrabbit@gmail.com> Tested-by: Hyunwoo Kim <imv4bel@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Kuan-Ting Chen <h3xrabbit@gmail.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> (cherry picked from commit f4c50a4) Signed-off-by: Shreeya Patel <spatel@ciq.com> Signed-off-by: Jonathan Maple <jonathan.l.maple@gmail.com>

github-actions · 2026-05-14T05:13:13Z

🤖 Validation Checks In Progress Workflow run: https://github.com/ctrliq/kernel-src-tree/actions/runs/25843052154

github-actions · 2026-05-14T05:13:14Z

🔍 Interdiff Analysis

⚠️ PR commit 6c2ab1a2abd (xfrm: esp: avoid in-place decrypt on shared skb frags) → upstream f4c50a4034e6
Differences found:

================================================================================
*    DELTA DIFFERENCES - code changes that differ between the patches          *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1438,9 +1438,6 @@
 			goto error;
 		}
 
-		if (!(flags & MSG_NO_SHARED_FRAGS))
-			skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
-
 		if (skb->ip_summed == CHECKSUM_NONE) {
 			__wsum csum;
 			csum = csum_page(page, offset, len);
--- b/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -959,7 +959,7 @@
 
 			goto skip_cow;
 		} else if (!skb_has_frag_list(skb) &&
-                   !skb_has_shared_frag(skb)) {
+			   !skb_has_shared_frag(skb)) {
 			nfrags = skb_shinfo(skb)->nr_frags;
 			nfrags++;
 

################################################################################
!    REJECTED PATCH2 HUNKS - could not be compared; manual review needed       !
################################################################################

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1233,6 +1233,8 @@
 			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;

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1230,6 +1230,6 @@
-			goto error;
-		}
-
-		if (skb->ip_summed == CHECKSUM_NONE) {
-			__wsum csum;
-			csum = csum_page(page, offset, len);
+			if (err < 0)
+				goto error;
+			copy = err;
+			wmem_alloc_delta += copy;
+		} else if (!zc) {
+			int i = skb_shinfo(skb)->nr_frags;

================================================================================
*    ONLY IN PATCH2 - files not modified by patch1                             *
================================================================================

--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1794,6 +1794,8 @@ alloc_new_skb:
 			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;

This is an automated interdiff check for backported commits.

github-actions · 2026-05-14T05:14:32Z

JIRA PR Check Results

2 commit(s) with issues found:

Commit `01e4dfc2ef4d`

Summary: net: skbuff: propagate shared-frag marker through frag-transfer helpers

❌ Errors:

VULN-185346: Status is 'To Do', expected 'In Progress'

⚠️ Warnings:

VULN-185346: No time logged - please log time manually

Commit `6c2ab1a2abdc`

Summary: xfrm: esp: avoid in-place decrypt on shared skb frags

❌ Errors:

VULN-184830: Status is 'Done', expected 'In Progress'

Summary: Checked 3 commit(s) total.

github-actions · 2026-05-14T05:14:33Z

❌ Validation checks completed with issues View full results: https://github.com/ctrliq/kernel-src-tree/actions/runs/25843052154

github-actions · 2026-05-14T09:18:49Z

🤖 Validation Checks In Progress Workflow run: https://github.com/ctrliq/kernel-src-tree/actions/runs/25852206246

github-actions · 2026-05-14T09:18:51Z

🔍 Interdiff Analysis

⚠️ PR commit 6c2ab1a2abd (xfrm: esp: avoid in-place decrypt on shared skb frags) → upstream f4c50a4034e6
Differences found:

================================================================================
*    DELTA DIFFERENCES - code changes that differ between the patches          *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1438,9 +1438,6 @@
 			goto error;
 		}
 
-		if (!(flags & MSG_NO_SHARED_FRAGS))
-			skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
-
 		if (skb->ip_summed == CHECKSUM_NONE) {
 			__wsum csum;
 			csum = csum_page(page, offset, len);
--- b/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -959,7 +959,7 @@
 
 			goto skip_cow;
 		} else if (!skb_has_frag_list(skb) &&
-                   !skb_has_shared_frag(skb)) {
+			   !skb_has_shared_frag(skb)) {
 			nfrags = skb_shinfo(skb)->nr_frags;
 			nfrags++;
 

################################################################################
!    REJECTED PATCH2 HUNKS - could not be compared; manual review needed       !
################################################################################

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1233,6 +1233,8 @@
 			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;

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1230,6 +1230,6 @@
-			goto error;
-		}
-
-		if (skb->ip_summed == CHECKSUM_NONE) {
-			__wsum csum;
-			csum = csum_page(page, offset, len);
+			if (err < 0)
+				goto error;
+			copy = err;
+			wmem_alloc_delta += copy;
+		} else if (!zc) {
+			int i = skb_shinfo(skb)->nr_frags;

================================================================================
*    ONLY IN PATCH2 - files not modified by patch1                             *
================================================================================

--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1794,6 +1794,8 @@ alloc_new_skb:
 			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;

This is an automated interdiff check for backported commits.

github-actions · 2026-05-14T09:20:08Z

JIRA PR Check Results

2 commit(s) with issues found:

Commit `01e4dfc2ef4d`

Summary: net: skbuff: propagate shared-frag marker through frag-transfer helpers

❌ Errors:

VULN-185346: Status is 'To Do', expected 'In Progress'

⚠️ Warnings:

VULN-185346: No time logged - please log time manually

Commit `6c2ab1a2abdc`

Summary: xfrm: esp: avoid in-place decrypt on shared skb frags

❌ Errors:

VULN-184830: Status is 'Done', expected 'In Progress'

Summary: Checked 4 commit(s) total.

github-actions · 2026-05-14T09:20:09Z

❌ Validation checks completed with issues View full results: https://github.com/ctrliq/kernel-src-tree/actions/runs/25852206246

jira VULN-185346 cve CVE-2026-46300 commit-author Hyunwoo Kim <imv4bel@gmail.com> commit - commit-source https://lore.kernel.org/all/agW4vC0r8QOUKtRT@v4bel/ upstream-diff | The upstream v3 patch does not apply cleanly to 5.14 due to two code reorganization differences: 1. skb_gro_receive_list() is in net/ipv4/udp_offload.c on 5.14, but was moved to net/core/gro.c in later kernels. The fix was applied to udp_offload.c instead. 2. skb_shift() in net/core/skbuff.c uses manual skb->len/data_len adjustments on 5.14, whereas upstream uses skb_len_add(). The surrounding context differs, causing the hunk to fail. The fix was applied at the equivalent location. The actual code changes are identical to upstream. Three frag-transfer helpers (__pskb_copy_fclone(), skb_try_coalesce(), and skb_shift()) fail to propagate the SKBFL_SHARED_FRAG bit in skb_shinfo()->flags when moving frags from source to destination. __pskb_copy_fclone() defers the rest of the shinfo metadata to skb_copy_header() after copying frag descriptors, but that helper only carries over gso_{size,segs,type} and never touches skb_shinfo()->flags; skb_try_coalesce() and skb_shift() move frag descriptors directly and leave flags untouched. As a result, the destination skb keeps a reference to the same externally-owned or page-cache-backed pages while reporting skb_has_shared_frag() as false. The mismatch is harmful in any in-place writer that uses skb_has_shared_frag() to decide whether shared pages must be detoured through skb_cow_data(). ESP input is one such writer (esp4.c, esp6.c), and a single nft 'dup to <local>' rule -- or any other nf_dup_ipv4() / xt_TEE caller -- is enough to land a pskb_copy()'d skb in esp_input() with the marker stripped, letting an unprivileged user write into the page cache of a root-owned read-only file via authencesn-ESN stray writes. Set SKBFL_SHARED_FRAG on the destination whenever frag descriptors were actually moved from the source. skb_copy() and skb_copy_expand() share skb_copy_header() too but linearize all paged data into freshly allocated head storage and emerge with nr_frags == 0, so skb_has_shared_frag() returns false on its own; they need no change. The same omission exists in skb_gro_receive() and skb_gro_receive_list(). The former moves the incoming skb's frag descriptors into the accumulator's last sub-skb via two paths (a direct frag-move loop and the head_frag + memcpy path); the latter chains the incoming skb whole onto p's frag_list. Downstream skb_segment() reads only skb_shinfo(p)->flags, and skb_segment_list() reuses each sub-skb's shinfo as the nskb -- both p and lp must carry the marker. Fixes: cef401d ("net: fix possible wrong checksum generation") Fixes: f4c50a4 ("xfrm: esp: avoid in-place decrypt on shared skb frags") Reported-by: William Bowling <vakzz@zellic.io> Reported-by: Hyunwoo Kim <imv4bel@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Hyunwoo Kim <imv4bel@gmail.com> Signed-off-by: Brett Mastbergen <bmastbergen@ciq.com>

github-actions · 2026-05-14T14:18:19Z

🤖 Validation Checks In Progress Workflow run: https://github.com/ctrliq/kernel-src-tree/actions/runs/25865213656

github-actions · 2026-05-14T14:18:20Z

🔍 Interdiff Analysis

⚠️ PR commit 6c2ab1a2abd (xfrm: esp: avoid in-place decrypt on shared skb frags) → upstream f4c50a4034e6
Differences found:

================================================================================
*    DELTA DIFFERENCES - code changes that differ between the patches          *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1438,9 +1438,6 @@
 			goto error;
 		}
 
-		if (!(flags & MSG_NO_SHARED_FRAGS))
-			skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
-
 		if (skb->ip_summed == CHECKSUM_NONE) {
 			__wsum csum;
 			csum = csum_page(page, offset, len);
--- b/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -959,7 +959,7 @@
 
 			goto skip_cow;
 		} else if (!skb_has_frag_list(skb) &&
-                   !skb_has_shared_frag(skb)) {
+			   !skb_has_shared_frag(skb)) {
 			nfrags = skb_shinfo(skb)->nr_frags;
 			nfrags++;
 

################################################################################
!    REJECTED PATCH2 HUNKS - could not be compared; manual review needed       !
################################################################################

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1233,6 +1233,8 @@
 			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;

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1230,6 +1230,6 @@
-			goto error;
-		}
-
-		if (skb->ip_summed == CHECKSUM_NONE) {
-			__wsum csum;
-			csum = csum_page(page, offset, len);
+			if (err < 0)
+				goto error;
+			copy = err;
+			wmem_alloc_delta += copy;
+		} else if (!zc) {
+			int i = skb_shinfo(skb)->nr_frags;

================================================================================
*    ONLY IN PATCH2 - files not modified by patch1                             *
================================================================================

--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1794,6 +1794,8 @@ alloc_new_skb:
 			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;

This is an automated interdiff check for backported commits.

github-actions · 2026-05-14T14:19:37Z

JIRA PR Check Results

2 commit(s) with issues found:

Commit `11c5deafa4de`

Summary: net: skbuff: propagate shared-frag marker through frag-transfer helpers

❌ Errors:

VULN-185346: Status is 'To Do', expected 'In Progress'

⚠️ Warnings:

VULN-185346: No time logged - please log time manually

Commit `6c2ab1a2abdc`

Summary: xfrm: esp: avoid in-place decrypt on shared skb frags

❌ Errors:

VULN-184830: Status is 'Done', expected 'In Progress'

Summary: Checked 3 commit(s) total.

github-actions · 2026-05-14T14:19:38Z

❌ Validation checks completed with issues View full results: https://github.com/ctrliq/kernel-src-tree/actions/runs/25865213656

github-actions · 2026-05-14T15:32:36Z

🤖 Validation Checks In Progress Workflow run: https://github.com/ctrliq/kernel-src-tree/actions/runs/25869091905

github-actions · 2026-05-14T15:32:37Z

🔍 Interdiff Analysis

⚠️ PR commit 6c2ab1a2abd (xfrm: esp: avoid in-place decrypt on shared skb frags) → upstream f4c50a4034e6
Differences found:

================================================================================
*    DELTA DIFFERENCES - code changes that differ between the patches          *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1438,9 +1438,6 @@
 			goto error;
 		}
 
-		if (!(flags & MSG_NO_SHARED_FRAGS))
-			skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
-
 		if (skb->ip_summed == CHECKSUM_NONE) {
 			__wsum csum;
 			csum = csum_page(page, offset, len);
--- b/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -959,7 +959,7 @@
 
 			goto skip_cow;
 		} else if (!skb_has_frag_list(skb) &&
-                   !skb_has_shared_frag(skb)) {
+			   !skb_has_shared_frag(skb)) {
 			nfrags = skb_shinfo(skb)->nr_frags;
 			nfrags++;
 

################################################################################
!    REJECTED PATCH2 HUNKS - could not be compared; manual review needed       !
################################################################################

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1233,6 +1233,8 @@
 			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;

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1230,6 +1230,6 @@
-			goto error;
-		}
-
-		if (skb->ip_summed == CHECKSUM_NONE) {
-			__wsum csum;
-			csum = csum_page(page, offset, len);
+			if (err < 0)
+				goto error;
+			copy = err;
+			wmem_alloc_delta += copy;
+		} else if (!zc) {
+			int i = skb_shinfo(skb)->nr_frags;

================================================================================
*    ONLY IN PATCH2 - files not modified by patch1                             *
================================================================================

--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1794,6 +1794,8 @@ alloc_new_skb:
 			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;

This is an automated interdiff check for backported commits.

github-actions · 2026-05-14T15:33:55Z

JIRA PR Check Results

2 commit(s) with issues found:

Commit `11c5deafa4de`

Summary: net: skbuff: propagate shared-frag marker through frag-transfer helpers

❌ Errors:

VULN-185346: Status is 'To Do', expected 'In Progress'

⚠️ Warnings:

VULN-185346: No time logged - please log time manually

Commit `6c2ab1a2abdc`

Summary: xfrm: esp: avoid in-place decrypt on shared skb frags

❌ Errors:

VULN-184830: Status is 'Done', expected 'In Progress'

Summary: Checked 3 commit(s) total.

github-actions · 2026-05-14T15:33:56Z

❌ Validation checks completed with issues View full results: https://github.com/ctrliq/kernel-src-tree/actions/runs/25869091905

github-actions · 2026-05-14T15:56:36Z

🤖 Validation Checks In Progress Workflow run: https://github.com/ctrliq/kernel-src-tree/actions/runs/25870325730

github-actions · 2026-05-14T15:56:37Z

🔍 Interdiff Analysis

⚠️ PR commit 6c2ab1a2abd (xfrm: esp: avoid in-place decrypt on shared skb frags) → upstream f4c50a4034e6
Differences found:

================================================================================
*    DELTA DIFFERENCES - code changes that differ between the patches          *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1438,9 +1438,6 @@
 			goto error;
 		}
 
-		if (!(flags & MSG_NO_SHARED_FRAGS))
-			skb_shinfo(skb)->flags |= SKBFL_SHARED_FRAG;
-
 		if (skb->ip_summed == CHECKSUM_NONE) {
 			__wsum csum;
 			csum = csum_page(page, offset, len);
--- b/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -959,7 +959,7 @@
 
 			goto skip_cow;
 		} else if (!skb_has_frag_list(skb) &&
-                   !skb_has_shared_frag(skb)) {
+			   !skb_has_shared_frag(skb)) {
 			nfrags = skb_shinfo(skb)->nr_frags;
 			nfrags++;
 

################################################################################
!    REJECTED PATCH2 HUNKS - could not be compared; manual review needed       !
################################################################################

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1233,6 +1233,8 @@
 			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;

================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1230,6 +1230,6 @@
-			goto error;
-		}
-
-		if (skb->ip_summed == CHECKSUM_NONE) {
-			__wsum csum;
-			csum = csum_page(page, offset, len);
+			if (err < 0)
+				goto error;
+			copy = err;
+			wmem_alloc_delta += copy;
+		} else if (!zc) {
+			int i = skb_shinfo(skb)->nr_frags;

================================================================================
*    ONLY IN PATCH2 - files not modified by patch1                             *
================================================================================

--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1794,6 +1794,8 @@ alloc_new_skb:
 			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;

This is an automated interdiff check for backported commits.

github-actions · 2026-05-14T15:57:54Z

JIRA PR Check Results

1 commit(s) with issues found:

Commit `6c2ab1a2abdc`

Summary: xfrm: esp: avoid in-place decrypt on shared skb frags

❌ Errors:

VULN-184830: Status is 'Done', expected 'In Progress'

Summary: Checked 3 commit(s) total.

github-actions · 2026-05-14T15:57:55Z

❌ Validation checks completed with issues View full results: https://github.com/ctrliq/kernel-src-tree/actions/runs/25870325730

PlaidCat

bmastbergen

🥌

PlaidCat added 2 commits May 13, 2026 20:26

Revert "xfrm: esp: avoid in-place decrypt on shared skb frags"

b1c20d8

This reverts commit bb274cc.

ciq-kernel-automation Bot added the created-by-kernelci Tag PRs that were automatically created when a user branch was pushed to the repo (kernelCI) label May 14, 2026

ciq-kernel-automation Bot changed the title ~~[ciqlts9_2] Multiple patches tested (3 commits)~~ [ciqlts9_2] Multiple patches tested (4 commits) May 14, 2026

bmastbergen force-pushed the {jmaple}_ciqlts9_2 branch from 5a65e78 to 11c5dea Compare May 14, 2026 14:10

bmastbergen changed the title ~~[ciqlts9_2] Multiple patches tested (4 commits)~~ [ciqlts9_2] Multiple patches tested (3 commits) May 14, 2026

PlaidCat approved these changes May 14, 2026

View reviewed changes

PlaidCat requested a review from a team May 14, 2026 16:11

bmastbergen approved these changes May 14, 2026

View reviewed changes

shreeya-patel98 approved these changes May 14, 2026

View reviewed changes

bmastbergen merged commit 70b8745 into ciqlts9_2 May 14, 2026
6 of 7 checks passed

bmastbergen deleted the {jmaple}_ciqlts9_2 branch May 14, 2026 16:55

Uh oh!

Conversation

ciq-kernel-automation Bot commented May 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Commit Message(s)

Test Results

✅ Build Stage

✅ Boot Verification

✅ Kernel Selftests

✅ LTP Results

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

🔍 Interdiff Analysis

Uh oh!

github-actions Bot commented May 14, 2026

JIRA PR Check Results

Commit 01e4dfc2ef4d

Commit 6c2ab1a2abdc

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

🔍 Interdiff Analysis

Uh oh!

github-actions Bot commented May 14, 2026

JIRA PR Check Results

Commit 01e4dfc2ef4d

Commit 6c2ab1a2abdc

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

🔍 Interdiff Analysis

Uh oh!

github-actions Bot commented May 14, 2026

JIRA PR Check Results

Commit 11c5deafa4de

Commit 6c2ab1a2abdc

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

🔍 Interdiff Analysis

Uh oh!

github-actions Bot commented May 14, 2026

JIRA PR Check Results

Commit 11c5deafa4de

Commit 6c2ab1a2abdc

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

github-actions Bot commented May 14, 2026

🔍 Interdiff Analysis

Uh oh!

github-actions Bot commented May 14, 2026

JIRA PR Check Results

Commit 6c2ab1a2abdc

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

PlaidCat left a comment

Choose a reason for hiding this comment

Uh oh!

bmastbergen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

ciq-kernel-automation Bot commented May 14, 2026 •

edited

Loading

Commit `01e4dfc2ef4d`

Commit `6c2ab1a2abdc`

Commit `01e4dfc2ef4d`

Commit `6c2ab1a2abdc`

Commit `11c5deafa4de`

Commit `6c2ab1a2abdc`

Commit `11c5deafa4de`

Commit `6c2ab1a2abdc`

Commit `6c2ab1a2abdc`