Skip to content

[rlc-10/6.12.0-211.16.1.el10_2] Multiple patches tested (2 commits)#1263

Merged
bmastbergen merged 2 commits into
rlc-10/6.12.0-211.16.1.el10_2from
{shreeya_gro_uaf}_rlc-10/6.12.0-211.16.1.el10_2
May 26, 2026
Merged

[rlc-10/6.12.0-211.16.1.el10_2] Multiple patches tested (2 commits)#1263
bmastbergen merged 2 commits into
rlc-10/6.12.0-211.16.1.el10_2from
{shreeya_gro_uaf}_rlc-10/6.12.0-211.16.1.el10_2

Conversation

@ciq-kernel-automation

@ciq-kernel-automation ciq-kernel-automation Bot commented May 25, 2026

Copy link
Copy Markdown

Summary

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

Commit Message(s)

net: gro: don't merge zcopy skbs

cve CVE-Pending
commit-author Sabrina Dubroca <sd@queasysnail.net>
commit 4db79a322db8c97f7b73b8a347395ef4d685eb40
smb: client: reject userspace cifs.spnego descriptions

cve CVE-Pending
commit-author Asim Viladi Oglu Manizada <manizada@pm.me>
commit 3da1fdf4efbc490041eb4f836bf596201203f8f2

Test Results

✅ Build Stage

Architecture Build Time Total Time
x86_64 38m 42s 39m 32s
aarch64 23m 39s 24m 17s

✅ Boot Verification

✅ Kernel Selftests

Architecture Passed Failed Compared Against Status
x86_64 429 63 rlc-10/6.12.0-211.16.1.el10_2 ✅ No regressions
aarch64 375 60 rlc-10/6.12.0-211.16.1.el10_2 ✅ No regressions

✅ LTP Results

Architecture Passed Failed Compared Against Status
x86_64 1479 79 rlc-10/6.12.0-211.16.1.el10_2 ✅ No regressions
aarch64 1452 80 rlc-10/6.12.0-211.16.1.el10_2 ✅ No regressions

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

@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 May 25, 2026
@shreeya-patel98
shreeya-patel98 requested a review from a team May 25, 2026 16:05
@ciq-kernel-automation ciq-kernel-automation Bot changed the title [rlc-10/6.12.0-211.16.1.el10_2] net: gro: don't merge zcopy skbs [rlc-10/6.12.0-211.16.1.el10_2] Multiple patches tested (2 commits) May 26, 2026
qsn and others added 2 commits May 26, 2026 12:56
cve CVE-Pending
commit-author Sabrina Dubroca <sd@queasysnail.net>
commit 4db79a3

skb_gro_receive() can currently copy frags between the source and GRO
skb, without checking the zerocopy status, and in particular the
SKBFL_MANAGED_FRAG_REFS flag.

When SKBFL_MANAGED_FRAG_REFS is set, the skb doesn't hold a reference
on the pages in shinfo->frags. Appending those frags to another skb's
frags without fixing up the page refcount can lead to UAF.

When either the last skb in the GRO chain (the one we would append
frags to) or the source skb is zerocopy, don't merge the skbs.

Fixes: 753f1ca ("net: introduce managed frags infrastructure")
Reported-by: Huzaifa Sidhpurwala <huzaifas@redhat.com>
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/c3b7f906bbfcbdfd7b4fa9d6c18a438870df85be.1779307748.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Shreeya Patel <spatel@ciq.com>
cve CVE-Pending
commit-author Asim Viladi Oglu Manizada <manizada@pm.me>
commit 3da1fdf

cifs.spnego key descriptions contain authority-bearing fields such as
pid, uid, creduid, and upcall_target that cifs.upcall treats as
kernel-originating inputs. However, userspace can also create keys of
this type through request_key(2) or add_key(2), allowing those fields to
be supplied without CIFS origin.

Only accept cifs.spnego descriptions while CIFS is using its private
spnego_cred to request the key.

Fixes: f1d662a ("[CIFS] Add upcall files for cifs to use spnego/kerberos")
Assisted-by: avom-custom-harness:gpt-5.5-qwen3.6-mod-mix
Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Asim Viladi Oglu Manizada <manizada@pm.me>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Shreeya Patel <spatel@ciq.com>
@bmastbergen
bmastbergen force-pushed the {shreeya_gro_uaf}_rlc-10/6.12.0-211.16.1.el10_2 branch from b134f00 to 2c08092 Compare May 26, 2026 16:56

@bmastbergen bmastbergen left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥌

@bmastbergen
bmastbergen requested a review from a team May 26, 2026 17:44
@bmastbergen
bmastbergen merged commit 86c8a2a into rlc-10/6.12.0-211.16.1.el10_2 May 26, 2026
5 checks passed
@bmastbergen
bmastbergen deleted the {shreeya_gro_uaf}_rlc-10/6.12.0-211.16.1.el10_2 branch May 26, 2026 18:22
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.

3 participants