Skip to content

fix cve-2022-21698 in nmi#7681

Merged
jslobodzian merged 4 commits intofasttrack/2.0from
tobiasb/cve-2022-21698-nmi
Feb 7, 2024
Merged

fix cve-2022-21698 in nmi#7681
jslobodzian merged 4 commits intofasttrack/2.0from
tobiasb/cve-2022-21698-nmi

Conversation

@tobiasb-ms
Copy link
Copy Markdown
Contributor

@tobiasb-ms tobiasb-ms commented Feb 5, 2024

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 (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/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

Fixes CVE-2022-21698 for nmi. The vulnerability is in the client_golang go module, which is vendored in this package. The upstream has a patch-level fix that takes the new version of client_golang, so the fix is to update the upstream.

Change Log
  • Update upstream code patch version
  • Generate new vendored tarball
  • Fix up %prep section
Does this affect the toolchain?

NO

Links to CVEs
Test Methodology

@tobiasb-ms tobiasb-ms requested a review from a team as a code owner February 5, 2024 20:04
@tobiasb-ms tobiasb-ms force-pushed the tobiasb/cve-2022-21698-nmi branch from 46059ec to 5e9cd70 Compare February 6, 2024 16:45
@tobiasb-ms tobiasb-ms force-pushed the tobiasb/cve-2022-21698-nmi branch from 5e9cd70 to 5d80d43 Compare February 6, 2024 23:34
@jslobodzian jslobodzian merged commit 916f9d2 into fasttrack/2.0 Feb 7, 2024
@jslobodzian jslobodzian deleted the tobiasb/cve-2022-21698-nmi branch February 7, 2024 01:02
@CBL-Mariner-Bot
Copy link
Copy Markdown
Collaborator

Auto cherry-pick results:

  • main ✅ -> Skipped

Auto cherry-pick pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=500530&view=results

tobiasb-ms added a commit that referenced this pull request Feb 8, 2024
)

Co-authored-by: jslobodzian <joslobo@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants