Skip to content

[Medium] Patch rook for CVE-2025-11065#15693

Open
akhila-guruju wants to merge 3 commits intomicrosoft:mainfrom
akhila-guruju:topic_rook-2.0
Open

[Medium] Patch rook for CVE-2025-11065#15693
akhila-guruju wants to merge 3 commits intomicrosoft:mainfrom
akhila-guruju:topic_rook-2.0

Conversation

@akhila-guruju
Copy link
Contributor

@akhila-guruju akhila-guruju commented Feb 3, 2026

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

Patch rook for CVE-2025-11065
Patch Modified: Yes (Details are mentioned in the comment)
Upstream Patch link: https://github.com/go-viper/mapstructure/commit/742921c9ba2854d27baa64272487fc5075d2c39c.patch

Change Log
  • new file: SPECS/rook/CVE-2025-11065.patch
  • modified: SPECS/rook/rook.spec
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Local Build
  • Patch applies cleanly
image image

@akhila-guruju
Copy link
Contributor Author

akhila-guruju commented Feb 3, 2026

Upstream patch has been Modified.

For file, decode_hooks.go
Many APIs are not present in the codebase. Below are the missing APIs in our version. Also, attaching the .rej file for reference.(changed the file format to .patch as github doesnot support .rej file to upload).
StringToURLHookFunc(), StringToNetIPAddrHookFunc(), StringToNetIPAddrPortHookFunc(), StringToNetIPPrefixHookFunc(), StringToInt8HookFunc(), StringToUint8HookFunc(), StringToInt16HookFunc(), StringToUint16HookFunc(), StringToInt32HookFunc(), StringToUint32HookFunc() StringToInt64HookFunc(), StringToUint64HookFunc(), StringToIntHookFunc(), StringToUintHookFunc(), StringToFloat32HookFunc(), StringToFloat64HookFunc(), StringToBoolHookFunc(), StringToComplex64HookFunc() StringToComplex128HookFunc()
decode_hooks.go-rej.patch

There is no decode_hooks_test.go file in our codebase.

There is noerrors.go file in our codebase but there is error.go file. So, added new APIs into this file.

For file mapstructure.go
As newDecodeError is not defined in error.go file, upstream patch failed to apply. As per the fix, err is replaced with wrapStrconvNumError(err)

@akhila-guruju akhila-guruju marked this pull request as ready for review February 3, 2026 12:08
@akhila-guruju akhila-guruju requested a review from a team as a code owner February 3, 2026 12:08
@Kanishk-Bansal
Copy link
Contributor

Buddy Build

@akhila-guruju
Copy link
Contributor Author

Build was successful but installation test was failing.
Verified installation in docker.

image image

@Kanishk-Bansal
Copy link
Contributor

Buddy Build

@Kanishk-Bansal
Copy link
Contributor

Build

Copy link
Contributor

@Kanishk-Bansal Kanishk-Bansal left a comment

Choose a reason for hiding this comment

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

Patch Analysis

  • Buddy Build 
  • patch applied during the build (check rpm.log)
  • patch include an upstream reference
  • PR has security tag

Patch has been backported.

For file, decode_hooks.go
Many APIs are not present in the codebase. Below are the missing APIs in our version. Also, attaching the .rej file for reference.(changed the fileformat to .patch as github doesnot support .rej file to upload).
StringToURLHookFunc(), StringToNetIPAddrHookFunc(), StringToNetIPAddrPortHookFunc(), StringToNetIPPrefixHookFunc(), StringToInt8HookFunc(), StringToUint8HookFunc(), StringToInt16HookFunc(), StringToUint16HookFunc(), StringToInt32HookFunc(), StringToUint32HookFunc() StringToInt64HookFunc(), StringToUint64HookFunc(), StringToIntHookFunc(), StringToUintHookFunc(), StringToFloat32HookFunc(), StringToFloat64HookFunc(), StringToBoolHookFunc(), StringToComplex64HookFunc() StringToComplex128HookFunc()
decode_hooks.go-rej.patch

There is no decode_hooks_test.go file in our codebase.

There is noerrors.go file in our codebase but there is error.go file. So, added new APIs into this file.

For file mapstructure.go
As newDecodeError is not defined in error.go file, upstream patch failed to apply. As per the fix, err is replaced with wrapStrconvNumError(err)

@Kanishk-Bansal Kanishk-Bansal added the ready-for-stable-review PR has passed initial review and is now ready for a second-level stable maintainer review label Feb 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main Packaging ready-for-stable-review PR has passed initial review and is now ready for a second-level stable maintainer review security

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants