Skip to content

[ciqlts9_2] Multiple patches tested (3 commits) - #1641

Open
ciq-kernel-automation[bot] wants to merge 3 commits into
ciqlts9_2from
{maple}_ciqlts9_2
Open

ciq-kernel-automation[bot] wants to merge 3 commits into
ciqlts9_2from
{maple}_ciqlts9_2

Conversation

@ciq-kernel-automation

Copy link
Copy Markdown

Summary

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

Commit Message(s)

crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg

jira VULN-158640
cve CVE-2025-39964
commit-author Herbert Xu <herbert@gondor.apana.org.au>
commit 1b34cbbf4f011a121ef7b2d7d6e6920a036d5285
crypto: af_alg - Fix incorrect boolean values in af_alg_ctx

jira VULN-212364
cve CVE-2025-40022
commit-author Eric Biggers <ebiggers@kernel.org>
commit d0ca0df179c4b21e2a6c4a4fb637aa8fa14575cb
netfilter: bridge: make ebt_snat ARP rewrite writable

jira VULN-190702
cve CVE-2026-53266
commit-author Yiming Qian <yimingqian591@gmail.com>
commit 67ba971ae02514d85818fe0c32549ab4bfa3bf49

Test Results

✅ Build Stage

Architecture Build Time Total Time
x86_64 24m 56s 25m 44s
aarch64 8m 35s 9m 7s

✅ Boot Verification

✅ Kernel Selftests

Architecture Passed Failed Compared Against Status
x86_64 174 24 ciqlts9_2 ✅ No regressions
aarch64 140 28 ciqlts9_2 ✅ No regressions

✅ LTP Results

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

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

jira VULN-158640
cve CVE-2025-39964
commit-author Herbert Xu <herbert@gondor.apana.org.au>
commit 1b34cbb

Issuing two writes to the same af_alg socket is bogus as the
data will be interleaved in an unpredictable fashion.  Furthermore,
concurrent writes may create inconsistencies in the internal
socket state.

Disallow this by adding a new ctx->write field that indiciates
exclusive ownership for writing.

Fixes: 8ff5909 ("crypto: algif_skcipher - User-space interface for skcipher operations")
	Reported-by: Muhammad Alifa Ramdhan <ramdhan@starlabs.sg>
	Reported-by: Bing-Jhong Billy Jheng <billy@starlabs.sg>
	Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 1b34cbb)
Signed-off-by: Jonathan Maple <jmaple@ciq.com>
jira VULN-212364
cve CVE-2025-40022
commit-author Eric Biggers <ebiggers@kernel.org>
commit d0ca0df

Commit 1b34cbb ("crypto: af_alg - Disallow concurrent writes in
af_alg_sendmsg") changed some fields from bool to 1-bit bitfields of
type u32.

However, some assignments to these fields, specifically 'more' and
'merge', assign values greater than 1.  These relied on C's implicit
conversion to bool, such that zero becomes false and nonzero becomes
true.

With a 1-bit bitfields of type u32 instead, mod 2 of the value is taken
instead, resulting in 0 being assigned in some cases when 1 was intended.

Fix this by restoring the bool type.

Fixes: 1b34cbb ("crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg")
	Cc: stable@vger.kernel.org
	Signed-off-by: Eric Biggers <ebiggers@kernel.org>
	Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit d0ca0df)
Signed-off-by: Jonathan Maple <jmaple@ciq.com>
jira VULN-190702
cve CVE-2026-53266
commit-author Yiming Qian <yimingqian591@gmail.com>
commit 67ba971

The ebtables SNAT target keeps the Ethernet source address rewrite
behind skb_ensure_writable(skb, 0).  This is intentional: at the bridge
ebtables hooks the Ethernet header is addressed through
skb_mac_header()/eth_hdr(), while skb->data points at the Ethernet
payload.  Asking skb_ensure_writable() for ETH_HLEN bytes would check
the payload, not the Ethernet header, and would reintroduce the small
packet regression fixed by commit 63137bc.

However, the optional ARP sender hardware address rewrite is different.
It writes through skb_store_bits() at an offset relative to skb->data:

        skb_store_bits(skb, sizeof(struct arphdr), info->mac, ETH_ALEN)

skb_header_pointer() only safely reads the ARP header; it does not make
the later sender hardware address range writable.  If that range is
still held in a nonlinear skb fragment backed by a splice-imported file
page, skb_store_bits() maps the frag page and copies the new MAC address
directly into it.

Ensure the ARP SHA range is writable before reading the ARP header and
before calling skb_store_bits().

Fixes: 63137bc ("netfilter: ebtables: Fixes dropping of small packets in bridge nat")
	Reported-by: Yiming Qian <yimingqian591@gmail.com>
	Signed-off-by: Yiming Qian <yimingqian591@gmail.com>
	Signed-off-by: Florian Westphal <fw@strlen.de>
	Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit 67ba971)
Signed-off-by: Jonathan Maple <jmaple@ciq.com>
@ciq-kernel-automation 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 Sep 23, 2026
@github-actions

Copy link
Copy Markdown

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

@github-actions

Copy link
Copy Markdown

🔍 Interdiff Analysis

  • ⚠️ PR commit 92d1e0fa4a2 (crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg) → upstream 1b34cbbf4f01
    Differences found:
================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@ -132,6 +132,6 @@
  *			SG?
  * @enc:		Cryptographic operation to be performed when
  *			recvmsg is invoked.
  * @init:		True if metadata has been sent.
  * @len:		Length of memory allocated for this data structure.
- */
+ * @inflight:		Non-zero when AIO requests are in flight.
@@ -156,4 +157,4 @@
 	bool init;
 
 	unsigned int len;
-};
+

This is an automated interdiff check for backported commits.

@github-actions

Copy link
Copy Markdown

Validation checks completed successfully View full results: https://github.com/ctrliq/kernel-src-tree/actions/runs/35802703537

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

created-by-kernelci Tag PRs that were automatically created when a user branch was pushed to the repo (kernelCI)

Development

Successfully merging this pull request may close these issues.

1 participant