Skip to content

qt6.qtwayland: backport fix for qtwayland compositor#370520

Merged
emilazy merged 1 commit intoNixOS:stagingfrom
wineee:qt6wayland
Jan 5, 2025
Merged

qt6.qtwayland: backport fix for qtwayland compositor#370520
emilazy merged 1 commit intoNixOS:stagingfrom
wineee:qt6wayland

Conversation

@wineee
Copy link
Member

@wineee wineee commented Jan 3, 2025

Things done

  1. https://codereview.qt-project.org/c/qt/qtwayland/+/598596

[PATCH] client: Run waylandscanner with private-code
This is the recommended mode, and failing to use private-code
makes libraries expose generated symbols like wl_shm_interface,
which may conflict with symbols from libwayland leading to
unexpected behavior or aborts.

This patch can replace #337913

  1. https://codereview.qt-project.org/c/qt/qtwayland/+/599732

Change shellSurface from a raw pointer to a QPointer to prevent
crash caused by accessing the wild pointer when shellSurface is destroyed

fix use after free in qtwayland compositor

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@wineee wineee changed the base branch from master to staging-next January 3, 2025 06:54
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jan 3, 2025
@wineee wineee marked this pull request as ready for review January 3, 2025 07:13
@K900
Copy link
Contributor

K900 commented Jan 3, 2025

This should go into staging, not staging-next.

@wineee wineee changed the base branch from staging-next to staging January 3, 2025 09:23
@emilazy emilazy merged commit 2ae6bd9 into NixOS:staging Jan 5, 2025
72 checks passed
@wineee wineee deleted the qt6wayland branch January 6, 2025 01:36
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 6, 2025

Successfully created backport PR for staging-24.11:

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

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants