(release/25.2) glx: fix DrawableGone use-after-free without rejecting duplicate drawables - #3333
Open
metux wants to merge 1 commit into
Conversation
…ables A window can have more than one __GLXdrawable registered under its X id. On teardown DrawableGone() freed the partner with FreeResourceByType(), which matches only id+type and so frees an arbitrary one, leaving the survivor dangling -> later use-after-free (issue #1491). Add FreeResourceByTypeValue() (internal, dix/resource_priv.h) that also matches the value, and use it in DrawableGone() to free the entry for this exact drawable. Fixes the UAF while keeping duplicate glXCreateWindow working, unlike the previous fix that rejected it and broke clients. Assisted-by: Claude Opus 4.8 <noreply@anthropic.com> Signed-off-by: Kiyoshi Spreclerg <kiyoshi_pip@protonmail.com> (cherry picked from commit 36b8a33)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A window can have more than one __GLXdrawable registered under its X id.
On teardown DrawableGone() freed the partner with FreeResourceByType(),
which matches only id+type and so frees an arbitrary one, leaving the
survivor dangling -> later use-after-free (issue #1491).
Add FreeResourceByTypeValue() (internal, dix/resource_priv.h) that also
matches the value, and use it in DrawableGone() to free the entry for
this exact drawable. Fixes the UAF while keeping duplicate glXCreateWindow
working, unlike the previous fix that rejected it and broke clients.
Assisted-by: Claude Opus 4.8 noreply@anthropic.com
Signed-off-by: Kiyoshi Spreclerg kiyoshi_pip@protonmail.com
(cherry picked from commit 36b8a33)
Backport of #3329 (master). Cherry-picked from commit 36b8a33.