(release/25.1) xnest: Check malloc return values in GCOps to avoid NULL dereferences - #3666
Open
metux wants to merge 4 commits into
Conversation
Contributor
Author
Reviewed Verdict: PASSIdentical +12/−2 cherry-pick of the No ABI impact (nested software DDX, no external driver/nvidia surface). Pure defensive No blocking findings. |
When building the xserver SDK on Linux (e.g. GitHub Actions Ubuntu runners), the BSD console macros (CONFIG_BSD_CONSOLE, CSRG_BASED, PCVT_SUPPORT, SYSCONS_SUPPORT, WSCONS_SUPPORT) were not defined because they were gated on host_machine.system(). This caused driver builds (e.g. xf86-input-keyboard) to fail when building against the SDK, as they reference xf86Info.consType and the PCCONS/SYSCONS/PCVT/WSCONS constants. Fix by defining these macros unconditionally in conf_data and xorg_data when build_xorg_sdk is true, so the installed SDK headers contain them regardless of the build platform. For non-SDK builds, keep the platform-appropriate conditional values. Also add CONFIG_BSD_CONSOLE to the xlibre-server.h template. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
metux
force-pushed
the
pr/release/25.1-xnest-check-malloc-return-values-in-gcops-to-avoid-null-dereferences_2026-08-31_15-05-17
branch
from
September 14, 2026 13:14
6b0e139 to
7c6acea
Compare
…lds" This reverts commit 64757a1.
The Cygwin meson runtime resolves to /usr/bin/python3.12.exe (python312 is pulled in transitively as a meson dependency), while the workflow only installed python39-lxml. hw/xwin/glx/meson.build therefore failed with "python3 lxml module not found" on every PR. Install the lxml module for the Python interpreter meson actually uses. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Check malloc() return values for NULL in xnestBitBlitHelper(), xnestPolyText8(), and xnestPolyText16() to prevent potential NULL pointer dereferences (cherry picked from commit eae9444) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
metux
force-pushed
the
pr/release/25.1-xnest-check-malloc-return-values-in-gcops-to-avoid-null-dereferences_2026-08-31_15-05-17
branch
from
September 18, 2026 14:55
7c6acea to
f627a48
Compare
metux
force-pushed
the
release/25.1
branch
2 times, most recently
from
October 5, 2026 08:39
626b3bc to
62a1396
Compare
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.
malloc() require check on valid ptr
Check malloc() return values for NULL in xnestBitBlitHelper(), xnestPolyText8(), and
xnestPolyText16() to prevent potential NULL pointer dereferences.
Backport of #3637 (based on its current head commit
eae9444; original PR not merged yet)
(cherry picked from commit eae9444)