23,334 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Enrico Weigelt, metux IT consult	e0aee883ee	hotfix release 25.2.2 ... xlibre-xserver-25.2.2 Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 16:57:57 +02:00
Gary T. Giesen	e0fffbce85	config/udev: guard against NULL subsystem in fallback bus id ... config_udev_get_fallback_bus_id() passes the result of udev_device_get_subsystem() straight into strcmp(). That accessor can return NULL when the device has no subsystem, so strcmp(NULL, "pci") dereferences a NULL pointer and the server crashes with a SIGSEGV. The path is reached for any DRM device with no udev ID_PATH property, where config_udev_odev_setup_attribs() falls back to this function. DisplayLink/evdi virtual cards have no ID_PATH; a udev remove of such a card during teardown can present a parent whose subsystem is already gone (reported NULL), and the unchecked strcmp faults. The same NULL-subsystem-into-strcmp class was fixed for the four sibling callers in this file by commit 429ee86a; config_udev_get_fallback_bus_id() was added later (commit 2f53d1cf) without the guard. The preceding parent==NULL case is already guarded here; extend the same defensiveness to the subsystem lookup. Related to: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1905 Signed-off-by: Gary T. Giesen <ggiesen@giesen.me> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2245> (cherry picked from commit 9babe7e7f6)	2026-07-23 13:48:49 +02:00
Enrico Weigelt, metux IT consult	1ced840c1e	Xext: xvmc: guard against NULL screen private in ProcXvMCGetDRInfo ... ProcXvMCGetDRInfo() fetched the per-screen XvMC private with XVMC_GET_PRIVATE() and immediately dereferenced it (strlen(pScreenPriv->clientDriverName)). The private is NULL for any screen on which XvMCScreenInit() was never called, while the extension and its private key become available globally as soon as any screen enables XvMC. A local client owning a valid Xv port on a non-XvMC screen (e.g. a multi-GPU setup where only one screen has XvMC) could thus crash the server. The three other port-taking XvMC handlers already check for NULL; do the same here and return BadMatch. Fixes: 3b0dce3620 ("lib/XvMC/Imake Added support for automatic loading of the correct hardware XvMC driver.") Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> (cherry picked from commit 6db14d020d)	2026-07-23 13:33:58 +02:00
Enrico Weigelt, metux IT consult	b1d744e8f2	xquartz: appledri: fix missing typecast ... macos compiler wants explicit typecast on x_rpcbuf_write_CARD8s() call. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 13:24:29 +02:00
Jeremy Huddleston Sequoia	a0a98dda05	xquartz/GL: Log failures on the indirect GLX make-current path ... The indirect GLX make-current path failed silently: an unsuccessful surface creation or context attach surfaced only as a generic GLXBadContext to the client, with nothing in the server log to indicate which Xplugin call rejected the request. Add error logging on each failure branch of the make-current, surface creation, and surface configuration code so the offending call and its error code are visible. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>	2026-07-23 13:24:29 +02:00
Jeremy Huddleston Sequoia	034b300b2a	xquartz: Activate the app via xp_window_activate() in -set_front_process: ... -[NSApplication activateIgnoringOtherApps:] is no longer supported under the macOS cooperative activation model, so use the new xp_window_activate() API instead. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>	2026-07-23 13:14:43 +02:00
dongshengyuan	b486d4482e	enhance: popen-fdopen-error-handling ... If fdopen() fails, close the unused pipe fd, free the pid list node, and restore the smart scheduler signal before returning NULL. Previously the fd would leak and the node would be added to pidlist with a NULL fp. Signed-off-by: dongshengyuan <545258830@qq.com> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2236>	2026-07-23 12:09:07 +02:00
NetSysFire	c15925453a	xorg.conf.man: Fix escape sequence typo ... Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2257> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 11:39:37 +02:00
Gary T. Giesen	e90c7e5a64	xfree86: set GPU screen FB/DGA defaults on runtime hotplug ... When a platform GPU device is added at runtime, xf86platformAddDevice calls AddGPUScreen without first assigning the EnableDisableFBAccess and SetDGAMode function-pointer defaults. The boot path in xf86Init.c sets both of these for every GPU screen before it calls AddGPUScreen, so a screen added by hotplug is left with SetDGAMode == NULL. modesetting's ScreenInit reaches xf86CrtcScreenInit, which wraps DGACloseScreen onto the screen regardless of how the screen was created. When the device is later removed, xf86platformRemoveDevice tears the GPU screen down and DGACloseScreen calls pScrn->SetDGAMode(pScrn, 0, NULL). On a hotplug-added screen that pointer is NULL, so the call faults and takes down the server with a SIGSEGV. This is not DisplayLink-specific: any modesetting platform GPU screen added at runtime and later removed hits it. DisplayLink/evdi just makes it easy to reproduce, because the evdi platform device is added and reconfigured at runtime. Mirror the boot path by assigning the same defaults in xf86platformAddDevice immediately before the AddGPUScreen call. Closes: #1904 Signed-off-by: Gary T. Giesen <ggiesen@giesen.me> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2244>	2026-07-22 17:11:30 +02:00
Peter Hutterer	a9f84fcef9	fb/mi/glamor: reject glyphs with negative dimensions ... GLYPHWIDTHPIXELS and GLYPHHEIGHTPIXELS compute glyph dimensions from signed INT16 fields. A crafted PCF font can produce negative results (e.g. rightSideBearing < leftSideBearing). All callees have a while (height--) loop which will end up in OOB writes for negative height values. In the case of a negative height, some callees cast to size_t or end up with negative strides. The same pattern exists in fbPoloyGlyphBit, miPolyGlyphBlt and glamor_poly_glyph_blt_gl, so let's fix all of them in one go. Assisted-by: Claude:claude-opus-4-6 Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2250> (cherry picked from commit e31efd3e10) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-22 16:22:27 +02:00
Enrico Weigelt, metux IT consult	85c5c355aa	Xext/xf86bigfont: guard the Unix-only bits for mingw (Windows) ... Building the extension on mingw (Windows, no SysV SHM → CONFIG_MITSHM off) failed on two counts: - QueryVersion filled the reply's uid/gid via geteuid()/getegid(), which Windows has no equivalent for (implicit-declaration error). Those fields only matter for the CONFIG_MITSHM local-shm path (off on Windows), so guard them (`#if !defined(WIN32) || defined(__CYGWIN__)` — Cygwin does have them); on native Windows uid/gid stay 0. - stuff_flags is only consumed under CONFIG_MITSHM, so with SHM off it was set-but-unused (-Werror=unused-but-set-variable). Scope its declaration and assignment under CONFIG_MITSHM too, matching how pDesc is already handled in this function. Verified the Linux (CONFIG_MITSHM, non-WIN32) path is unchanged and builds clean; the Windows path is validated by the mingw32 CI lane. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> (cherry picked from commit 43143d82e9)	2026-07-22 10:32:26 +02:00
Enrico Weigelt, metux IT consult	78f1c1c68f	Xext/xf86bigfont: drop the Linux-only <sys/sysmacros.h> include ... xf86bigfont.c unconditionally included <sys/sysmacros.h> inside the CONFIG_MITSHM block. That header is glibc/Linux-specific (major()/minor()/ makedev()) and does not exist on the BSDs or macOS, so building the extension there fails: xf86bigfont.c:49:10: fatal error: 'sys/sysmacros.h' file not found None of those macros are used in this file, so the include is simply removed. Fixes the compile break on macOS, FreeBSD, DragonFly, NetBSD and OpenBSD (surfaced once the extension was built in CI). Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> (cherry picked from commit c504e16903)	2026-07-22 10:32:26 +02:00
Enrico Weigelt, metux IT consult	844c195daf	bugfix release 25.2.1 ... xlibre-xserver-25.2.1 Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-14 19:28:42 +02:00
Peter Hutterer	715360ca01	glx: free old context tag before allocating new one in CommonMakeCurrent ... oldTag in CommonMakeCurrent() is a pointer to cl->contextTags[...]. CommonMakeCurrent() may realloc(cl->contextTags) and thus move the memory, leaving oldTag as dangling pointer. If we then GlxFreeContextTag(oldTag) we end up writing into freed memory. Fix this by freeing oldTag before CommonMakeNewCurrent(). This vulnerability was discovered by: Anonymous working with Trend Micro Zero Day Initiative CVE-2026-56000/ZDI-CAN-30561 Fixes: 4781f2a5a8 ("GLX: Free the tag of the old context later") Assisted-by: Claude:claude-opus-4-6 Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2250> (cherry picked from commit 2779affbdb) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-14 19:27:55 +02:00
Peter Hutterer	6a829c4269	glamor: reject fonts with per-glyph metrics exceeding maxbounds ... glamor_font_get() computes the atlas slot size from the font's declared maxbounds, but copies each glyph's bitmap using the per-glyph metrics (GLYPHHEIGHTPIXELS/GLYPHWIDTHBYTES macros). When a malicious PCF font has per-glyph metrics exceeding maxbounds, the memcpy writes past the heap-allocated atlas buffer. Negative per-glyph metrics are even worse: the loop counter wraps to ~4 billion iterations (via unsigned cast) or memcpy's size parameter wraps to SIZE_MAX. The PCF parser in libXfont2 does not recompute maxbounds from per-glyph data (only the BDF parser does), so the file's declared maxbounds values are trusted as-is. Reject fonts where any per-glyph metric is negative or exceeds the atlas slot size, falling back to software rendering which uses per-glyph metrics directly without an atlas. This vulnerability was discovered by: Anonymous working with Trend Micro Zero Day Initiative CVE-2026-55999/ZDI-CAN-30498 Assisted-by: Claude:claude-opus-4-6 Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2250> (cherry picked from commit fbf7bac22e) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-14 11:44:45 +02:00
Enrico Weigelt, metux IT consult	79efffb355	ci: freebsd: fix pkg-version-skew + missing bzip2.pc build breakage ... Adapted backport of master's three commits (this release's install-pkg.sh lacks master's retry()/catalogue-refresh scaffolding, so this isn't a mechanical cherry-pick - same net effect, minimal diff against what's actually here): - aaab164c0e ci: freebsd: set IGNORE_OSVERSION=yes to survive pkg repo/VM release skew - f95ab701fe ci: freebsd: install bzip2 (freetype2's pkgconfig Requires) - a959773be9 ci: freebsd: synthesize a bzip2.pc if the bzip2 package doesn't ship one (cherry picked from commits aaab164c0e, f95ab701fe, a959773be9) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-06 20:16:20 +02:00
Enrico Weigelt, metux IT consult	a2fd9501d1	panoramiX: make XINERAMA_FOR_EACH_SCREEN_* macros variadic ... The XINERAMA_FOR_EACH_SCREEN_FORWARD / _FORWARD_SKIP0 / _BACKWARD macros took the loop body as a single macro parameter. Any top-level comma in the body was therefore parsed as an argument separator, so a body containing e.g. a designated initialiser (`Foo f = { .a = 1, .b = 2 };`) failed to compile — the reason for the existing "static init would confuse preprocessor" workarounds at the call sites. Pass the body as a variadic argument (`...` / `__VA_ARGS__`) instead. Commas in the body are then preserved, so ordinary designated initialisers (and other comma-containing statements) can be used in the loop body without compound-literal-cast or memset workarounds. Pure enabling change: all existing call sites pass a single brace block, which is unchanged as __VA_ARGS__. Build-verified (Xvfb/Xnest link). Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> (cherry picked from commit 486d71c5b0)	2026-07-02 19:53:02 +02:00
stefan11111	c6eaa06ba4	xfree86: Add missing string padding to the DGA QueryMode request handler ... Fixes: 4d66d6f9ac Signed-off-by: stefan11111 <stefan11111github@gmail.com> (cherry picked from commit 9fd97d52cf)	2026-07-01 19:40:48 +02:00
Enrico Weigelt, metux IT consult	e8975f1af0	xkb: zero padding in GetMap reply wire descriptors ... The XkbGetMap reply builders left padding bytes unwritten in buffers allocated with the non-zeroing x_rpcbuf_reserve(), disclosing uninitialized server heap to the client: * xkbKeyTypeWireDesc.pad and xkbKTMapEntryWireDesc.pad (XkbWriteKeyTypes) * xkbBehaviorWireDesc.pad (XkbWriteKeyBehaviors) * xkbVModMapWireDesc.pad (XkbWriteVirtualModMap) * the XkbPaddedSize() rounding tail of the key-action count array (XkbWriteKeyActions) and the explicit-component array (XkbWriteExplicit) Use x_rpcbuf_reserve0() for these reservations. Fixes: 742443ea73 ("xkb: pass x_rpcbuf_t into XkbAssembleMap()") Fixes: bee50daeca ("xkb: use x_rpcbuf_t in XkbWriteKeyActions()") Fixes: 316e5e431a ("xkb: use x_rpcbuf_t in XkbWriteKeyBehaviors()") Fixes: e5d91b49e5 ("xkb: use x_rpcbuf_t in XkbWriteExplicit()") Fixes: c3052dbc39 ("xkb: use x_rpcbuf_t in XkbWriteVirtualModMap()") Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-22 17:22:50 +02:00
Enrico Weigelt, metux IT consult	3422d85cb7	release 25.2.0 ... xlibre-xserver-25.2.0 Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-21 13:59:17 +02:00
Enrico Weigelt, metux IT consult	5524a5aef6	.github: drop release job dependency on cygwin ... Cygwin sometimes has transient failures, and might have trouble w/ git on tags. We don't want it to stop our release tag builds (all commits are checked via PR pipelines anyways) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-21 13:59:11 +02:00
Enrico Weigelt, metux IT consult	27ef05b6e7	ci: remove check-sign-off from release job needs ... The check-sign-off job only runs on pull_request events, so on tag pushes it is skipped. When a needed job is skipped, GitHub Actions also skips the dependent job, preventing the release from being created.	2026-06-21 13:58:58 +02:00
Enrico Weigelt, metux IT consult	94f59bddec	ci: use checkout@v4 instead of v6 for Cygwin job ... actions/checkout@v6 uses Cygwin's git when run after Cygwin install, which fails on tag refs with 'ambiguous argument <tag>^commit'. Downgrade to v4 which works correctly.	2026-06-21 13:58:56 +02:00
Enrico Weigelt, metux IT consult	2c1ee3b3d1	ci: checkout before Cygwin install in cygwin job ... actions/checkout@v6 uses Cygwin's git when run after Cygwin install, which fails on tag refs with 'ambiguous argument <tag>^commit'. Checkout with Windows git first, then install Cygwin.	2026-06-21 13:58:26 +02:00
Enrico Weigelt, metux IT consult	5b016019b1	NEWS: add 25.2.0 release entry	2026-06-19 19:24:57 +02:00
Enrico Weigelt, metux IT consult	a9587bd0fa	include: inputstr.h: drop assert() ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-19 19:24:57 +02:00
Enrico Weigelt, metux IT consult	15f064b657	xquartz: fix missing includes of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-19 19:24:57 +02:00
Enrico Weigelt, metux IT consult	7605fcb66d	xfree86: fix missing / obsolete includes of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-19 19:24:57 +02:00
Enrico Weigelt, metux IT consult	928d74a6fb	kdrive: fix missing includes of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-19 19:24:57 +02:00
Enrico Weigelt, metux IT consult	876c782094	treewide: clean up includes of misc.h ... adding include/ prefix to it. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-19 19:24:57 +02:00
Enrico Weigelt, metux IT consult	c5e5b4d233	.github: netbsd: try several mirrors ... The default mirror (on fastly) fails regularily, so we have to try several ones, in order to prevent our whole pipeline from failing. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-19 19:24:57 +02:00
Enrico Weigelt, metux IT consult	b048e3129c	Xext: move sleepuntil.c to dix ... It's a generic function operating on clients, not extensions specific. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-19 09:37:22 +02:00
Enrico Weigelt, metux IT consult	02ecb28c4c	mi: mipoly.h: drop obsolete assert() ... not hit for aeons now, not actually needed anymore. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 17:47:03 +02:00
Enrico Weigelt, metux IT consult	4fc90684e6	Xext: xcmisc: move it to it's own subdir ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 17:45:32 +02:00
Enrico Weigelt, metux IT consult	1d6a4711bf	dix: fix missing includes of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 17:36:59 +02:00
Enrico Weigelt, metux IT consult	f409c26f6d	glamor: fix missing includes of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 17:12:08 +02:00
Enrico Weigelt, metux IT consult	beca63fbe4	exa: fix missing includes of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 16:54:16 +02:00
Enrico Weigelt, metux IT consult	be7a32d73d	Xext: composite: drop unused include of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 16:45:23 +02:00
Enrico Weigelt, metux IT consult	e77e698303	os: fix missing includes of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 16:18:12 +02:00
Enrico Weigelt, metux IT consult	8e0d8b270b	test: xtest.c: fix missing include of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 15:54:22 +02:00
Enrico Weigelt, metux IT consult	fdc9819e6c	Xext: sync: move it into it's own subdir ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 15:32:45 +02:00
Enrico Weigelt, metux IT consult	ee50768a3f	Xext: security: move it into it's own subdir ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 14:47:39 +02:00
Enrico Weigelt, metux IT consult	3535961183	Xext: geext: move it into its own subdir ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 14:07:18 +02:00
Enrico Weigelt, metux IT consult	b159041404	os: drop ifdef on CLIENTIDS ... it's especially needed for xres, which is always enabled anyways. no need for the extra complexity here. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 13:50:17 +02:00
Enrico Weigelt, metux IT consult	cd3b134234	include: extnsionst.h: drop unnecessary includes ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 13:50:05 +02:00
Enrico Weigelt, metux IT consult	671184af06	xwin: fix missing includes of <assert.h> ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 13:07:37 +02:00
Enrico Weigelt, metux IT consult	0914a89da6	Xext: bigreq: move it into it's own subdir ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 13:07:15 +02:00
Enrico Weigelt, metux IT consult	ea530f571c	os: rename __size_assert() into __SIZE_ASSERT() ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 12:01:35 +02:00
Enrico Weigelt, metux IT consult	fe3aaea898	Xext: saver: move it into it's own subdir ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 12:01:27 +02:00
Enrico Weigelt, metux IT consult	5e61f9f370	Xext: composite: drop ancient unused debug code ... this code hasn't been enabled for decades now, so not needed anymore. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-06-18 10:42:26 +02:00