Skip to content

[ciqcbr7_9] smb: client: reject userspace cifs.spnego descriptions#1270

Merged
bmastbergen merged 1 commit into
ciqcbr7_9from
{shreeya_cifs_spnego}_ciqcbr7_9
May 26, 2026
Merged

[ciqcbr7_9] smb: client: reject userspace cifs.spnego descriptions#1270
bmastbergen merged 1 commit into
ciqcbr7_9from
{shreeya_cifs_spnego}_ciqcbr7_9

Conversation

@ciq-kernel-automation

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

Copy link
Copy Markdown

Summary

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

Commit Message(s)

smb: client: reject userspace cifs.spnego descriptions

cve CVE-Pending
commit-author Asim Viladi Oglu Manizada <manizada@pm.me>
commit 3da1fdf4efbc490041eb4f836bf596201203f8f2
upstream-diff |
  File path: upstream uses fs/smb/client/cifs_spnego.c, this branch
  uses fs/cifs/cifs_spnego.c. Code is identical.

Test Results

✅ Build Stage

  • Status: Passed (x86_64)

  • Build Time: 13m 10s

  • Total Time: 14m 15s

  • View build logs

✅ Boot Verification


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

@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 26, 2026
@github-actions

Copy link
Copy Markdown

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

@github-actions

Copy link
Copy Markdown

🔍 Interdiff Analysis

  • ⚠️ PR commit 08ac144b7273 (smb: client: reject userspace cifs.spnego descriptions) → upstream 3da1fdf4efbc
    Differences found:
================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/fs/cifs/cifs_spnego.c
+++ b/fs/smb/client/cifs_spnego.c
@@ -49,4 +37,4 @@
-	kfree(key->payload.data);
+	kfree(key->payload.data[0]);
 }
 
 
@@ -67,3 +49,2 @@
 	.instantiate	= cifs_spnego_key_instantiate,
-	.match		= user_match,
 	.destroy	= cifs_spnego_key_destroy,

This is an automated interdiff check for backported commits.

@github-actions

Copy link
Copy Markdown

JIRA PR Check Results

1 commit(s) with issues found:

Commit 08ac144b7273

Summary: smb: client: reject userspace cifs.spnego descriptions

❌ Errors:

  • VULN-: Failed to retrieve ticket: JiraError HTTP 404 url: https://ciqinc.atlassian.net/rest/api/2/issue/VULN-
    text: Issue does not exist or you do not have permission to see it.

    response headers = {'Content-Type': 'application/json;charset=UTF-8', 'Transfer-Encoding': 'chunked', 'Connection': 'keep-alive', 'Date': 'Tue, 26 May 2026 09:28:51 GMT', 'Server': 'AtlassianEdge', 'Timing-Allow-Origin': '*', 'X-Arequestid': '4a7045f727dd769b754726d0d677588b', 'X-Aaccountid': '712020%3A43f5a558-0b78-4cc1-ad9e-a61d9b0317de', 'Cache-Control': 'no-cache, no-store, no-transform', 'Ratelimit-Policy': '"jira-burst-based";q=150;w=1', 'Ratelimit': '"jira-burst-based";r=399;t=1', 'X-Ratelimit-Limit': '400', 'X-Ratelimit-Remaining': '399', 'Content-Encoding': 'gzip', 'X-Content-Type-Options': 'nosniff', 'X-Xss-Protection': '1; mode=block', 'Atl-Traceid': 'b5662215fecc421f82886fcfa52a25ab', 'Atl-Request-Id': 'b5662215-fecc-421f-8288-6fcfa52a25ab', 'Strict-Transport-Security': 'max-age=63072000; includeSubDomains; preload', 'Report-To': '{"endpoints": [{"url": "https://dz8aopenkvv6s.cloudfront.net"}], "group": "endpoint-1", "include_subdomains": true, "max_age": 600}', 'Nel': '{"failure_fraction": 0.01, "include_subdomains": true, "max_age": 600, "report_to": "endpoint-1"}', 'Server-Timing': 'atl-edge;dur=50,atl-edge-internal;dur=13,atl-edge-upstream;dur=37,atl-edge-pop;desc="aws-us-west-2"', 'X-Cache': 'Error from cloudfront', 'Via': '1.1 ccb414ab5bdb778a5639e83972f955e6.cloudfront.net (CloudFront)', 'X-Amz-Cf-Pop': 'IAD55-P2', 'X-Amz-Cf-Id': 'nK3oauhI6pnvS1XnU-RGxubBGZrt7gBRZ-94xrDRRwn3OUah3m2ToA=='}
    response text = {"errorMessages":["Issue does not exist or you do not have permission to see it."],"errors":{}}


Summary: Checked 1 commit(s) total.

@github-actions

Copy link
Copy Markdown

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

cve CVE-Pending
commit-author Asim Viladi Oglu Manizada <manizada@pm.me>
commit 3da1fdf
upstream-diff |
  File path: upstream uses fs/smb/client/cifs_spnego.c, this branch
  uses fs/cifs/cifs_spnego.c. Code is identical.

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_cifs_spnego}_ciqcbr7_9 branch from 08ac144 to 3fd32bc Compare May 26, 2026 16:41
@bmastbergen bmastbergen requested a review from a team May 26, 2026 16:41
@github-actions

Copy link
Copy Markdown

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

@github-actions

Copy link
Copy Markdown

🔍 Interdiff Analysis

  • ⚠️ PR commit 3fd32bc13bd3 (smb: client: reject userspace cifs.spnego descriptions) → upstream 3da1fdf4efbc
    Differences found:
================================================================================
*    CONTEXT DIFFERENCES - surrounding code differences between the patches    *
================================================================================

--- b/fs/cifs/cifs_spnego.c
+++ b/fs/smb/client/cifs_spnego.c
@@ -49,4 +37,4 @@
-	kfree(key->payload.data);
+	kfree(key->payload.data[0]);
 }
 
 
@@ -67,3 +49,2 @@
 	.instantiate	= cifs_spnego_key_instantiate,
-	.match		= user_match,
 	.destroy	= cifs_spnego_key_destroy,

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/26462460320

@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:15
@bmastbergen bmastbergen merged commit 3cc43ad into ciqcbr7_9 May 26, 2026
3 of 4 checks passed
@bmastbergen bmastbergen deleted the {shreeya_cifs_spnego}_ciqcbr7_9 branch May 26, 2026 18:18
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.

2 participants