Skip to content

[Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49175, CVE-2025-49177, CVE-2025-49178, CVE-2025-49179, CVE-2025-49180 #14082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 5 commits into
base: 3.0-dev
Choose a base branch
from
Open

[Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49175, CVE-2025-49177, CVE-2025-49178, CVE-2025-49179, CVE-2025-49180 #14082

wants to merge 5 commits into from

Conversation

kevin-b-lockwood
Copy link
Contributor

@kevin-b-lockwood kevin-b-lockwood commented Jun 23, 2025 •
edited
Loading

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 xorg-x11-server-Xwayland for CVE-2025-49175, CVE-2025-49177, CVE-2025-49178, CVE-2025-49179, CVE-2025-49180

Change Log

All patches sourced from Astrolabe

  • Add patch for CVE-2025-49175
    • Patch unchanged from upstream besides adding upstream patch link
    • Patch applied cleanly:
      image
  • Add patch for CVE-2025-49177
    • Only edit to the upstream patch was because the patcher could not find where to position a hunk
    • Patch applied cleanly:
      image
  • Add patch for CVE-2025-49178
    • Patch unchanged from upstream besides adding upstream patch link
    • Patch applied cleanly:
      image
  • Add patch for CVE-2025-49179
    • Edited the include as compared with upstream because upstream moved
      the include in a prior commit.
    • Patch applied cleanly:
      image
  • Add patch for CVE-2025-49180
    • Patch unchanged from upstream besides adding upstream patch link
    • Patch applied cleanly:
      image
Does this affect the toolchain?

NO

Links to CVEs
Test Methodology
  • Local build

@kevin-b-lockwood kevin-b-lockwood requested a review from a team as a code owner June 23, 2025 22:03
@kevin-b-lockwood kevin-b-lockwood marked this pull request as draft June 23, 2025 22:03
@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels Jun 23, 2025
@kevin-b-lockwood kevin-b-lockwood changed the title [Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49179 [Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49177, CVE-2025-49179 Jun 23, 2025
@kevin-b-lockwood kevin-b-lockwood changed the title [Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49177, CVE-2025-49179 [Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49177, CVE-2025-49178, CVE-2025-49179 Jun 23, 2025
@kevin-b-lockwood kevin-b-lockwood changed the title [Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49177, CVE-2025-49178, CVE-2025-49179 [Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49175, CVE-2025-49177, CVE-2025-49178, CVE-2025-49179 Jun 23, 2025
@kevin-b-lockwood kevin-b-lockwood force-pushed the kevin-b-lockwood/xorg-x11-server-Xwayland-3.0-CVE branch from d153b8b to 5f4fee9 Compare June 23, 2025 23:57
@kevin-b-lockwood kevin-b-lockwood changed the title [Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49175, CVE-2025-49177, CVE-2025-49178, CVE-2025-49179 [Medium] Patch xorg-x11-server-Xwayland for CVE-2025-49175, CVE-2025-49177, CVE-2025-49178, CVE-2025-49179, CVE-2025-49180 Jun 24, 2025
Sumynwa
Sumynwa requested changes Jun 24, 2025
View reviewed changes
@kevin-b-lockwood kevin-b-lockwood force-pushed the kevin-b-lockwood/xorg-x11-server-Xwayland-3.0-CVE branch from 5f4fee9 to 0204419 Compare June 24, 2025 18:01
@kevin-b-lockwood kevin-b-lockwood marked this pull request as ready for review June 25, 2025 23:10
@Sumynwa
Copy link
Contributor

Sumynwa commented Jul 2, 2025

Validated all patches with upstream.

@Sumynwa
Copy link
Contributor

Sumynwa commented Jul 2, 2025

Buddy Build: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=855370&view=results

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

@Sumynwa Sumynwa

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
3.0-dev PRs Destined for AzureLinux 3.0 Packaging security
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kevin-b-lockwood @Sumynwa @Kanishk-Bansal