23,618 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Enrico Weigelt, metux IT consult	193d9769ce	dix: main: fix indentions ... these are fallout of prior generation loop removal. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 14:02:20 +02:00
Enrico Weigelt, metux IT consult	ece2b308ba	xext: composite: let compScreenInit() return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 13:29:04 +02:00
Enrico Weigelt, metux IT consult	2635578f3b	xext: composite: drop obsolete DeleteWindowNoInputDevices() declaration ... the function doesn't exist anymore. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 13:28:56 +02:00
Enrico Weigelt, metux IT consult	37be72a3a4	xext: dri2: change needInvalidate field from Bool to bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 12:56:22 +02:00
Enrico Weigelt, metux IT consult	29ffd96c2c	xext: composite: drop obsolete include of xace.h ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 12:56:02 +02:00
Enrico Weigelt, metux IT consult	4f8895a34a	xext: dpms: make DPMSSupported() static and let it return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 11:58:10 +02:00
Enrico Weigelt, metux IT consult	4e8653e3eb	xext: dpms: let isUnblank() return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 11:52:08 +02:00
Enrico Weigelt, metux IT consult	d680344fda	xext: doublebuffer: let GetVisualInfo() method return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 11:51:57 +02:00
Enrico Weigelt, metux IT consult	02f230f37e	xext: dpms: change DPMSEnabled and DPMSDisabledSwitch from Bool to bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 11:51:45 +02:00
Enrico Weigelt, metux IT consult	765463b2ec	xext: composite: make compDestroyOverlayWindow() static ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 11:51:36 +02:00
Enrico Weigelt, metux IT consult	ca2aa9448a	xext: doublebuffer: replace Bool variables by bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-24 11:51:20 +02:00
Enrico Weigelt, metux IT consult	cb955b32a7	xext: doublebuffer: let SetupBackgroundPainter() return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 19:28:40 +02:00
Enrico Weigelt, metux IT consult	c63b497aa9	xext: composite: let compCreateOverlayWindow() return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 19:22:28 +02:00
Enrico Weigelt, metux IT consult	62b2b64504	xext: doublebuffer: let miDbeInit() return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 19:14:23 +02:00
Enrico Weigelt, metux IT consult	692e477636	xext: damage: let DamageExtSubtract() return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 19:06:49 +02:00
Enrico Weigelt, metux IT consult	88116f38bd	xext: composite: let compReallocPixmap() return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 18:49:06 +02:00
Enrico Weigelt, metux IT consult	a87da95910	xext: damage: let DamageExtRegister() take bool parameter ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 18:48:53 +02:00
Enrico Weigelt, metux IT consult	e1e63e6c9f	xext: composite: move some function declarations ... move it them the compositeext_priv.h header, which is supposed to be the one included by other parts of the Xserver. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 18:48:47 +02:00
Enrico Weigelt, metux IT consult	10f8e24747	xext: composite: let compAddAlternateVisuals() return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 17:58:43 +02:00
Enrico Weigelt, metux IT consult	6f04b34f76	xext: composite: let compRegisterAlternateVisuals() return bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 17:41:26 +02:00
Enrico Weigelt, metux IT consult	2de1f21a1f	xext: composite: make compCheckRedirect() bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 17:22:14 +02:00
Enrico Weigelt, metux IT consult	3b05cb9aa1	xext: composite: make CompositeIsImplicitRedirectException() static and bool ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 15:04:05 +02:00
Enrico Weigelt, metux IT consult	9b7d25945f	os: drop xstrcasestr() ... Windows is the only platform not providing strcasestr, and it's only user is the xfree86 DDX, which only runs on Unix. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 14:35:08 +02:00
Enrico Weigelt, metux IT consult	86023cb129	Xext: composite: make compAllocPixmap() bool ... use stdbool's bool type instead of our own. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 14:30:21 +02:00
NetSysFire	7e1a7eb959	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:44:04 +02:00
dongshengyuan	f8051cf079	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 11:43:13 +02:00
Gary T. Giesen	0cfc3de3d6	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-23 11:00:42 +02:00
Enrico Weigelt, metux IT consult	badb04c993	Xext: composite: make compMarkedWindows() bool ... Use stdbool's 'bool' type instead of our own 'Bool' Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-23 10:58:18 +02:00
Jeremy Huddleston Sequoia	ac81a25ded	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 10:43:33 +02:00
Kiyoshi Spreclerg	36b8a3323c	glx: fix DrawableGone use-after-free without rejecting duplicate drawables ... 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>	2026-07-21 13:22:41 +02:00
Kiyoshi Spreclerg	1486875701	Revert "glx: reject duplicate GLX drawable for a window (fix UAF in DrawableGone)" ... This reverts commit 5d96fc048e.	2026-07-21 13:22:41 +02:00
Enrico Weigelt, metux IT consult	e25f7999e1	os: client: check calloc() result before sysctl(KERN_PROC_ARGS) ... DetermineClientCmd()'s FreeBSD/DragonFly branch passed calloc()'s result straight to sysctl() as the output buffer, then unconditionally strlen()/strdup()'d it, with no NULL check in between. A failed allocation (OOM) would hand sysctl() a NULL buffer pointer and, should that not fault on its own, fall through to strlen(NULL)/strdup(NULL). Add the same NULL check already used for the equivalent macOS KERN_PROCARGS2 buffer a few lines up in this same function. Not locally compile-tested (no FreeBSD/DragonFly toolchain available in this environment) -- mirrors the exact, already-working pattern from the macOS branch above it; relying on this project's FreeBSD CI lane to confirm. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-15 12:28:20 +02:00
Enrico Weigelt, metux IT consult	995d4979fe	CI: solaris: drop non-existent x11/library/libxt from pkg list ... The FMRI does not exist in the OpenIndiana Hipster catalog (both the old per-package loop and the new batched install failed on it; the xserver does not link libXt, so the build succeeds without it). A single unmatched FMRI aborts the whole IPS transaction, so leaving it in broke the batched install and forced the per-package fallback. Removing it lets the single pkg install transaction succeed. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-14 13:56:46 +02:00
Enrico Weigelt, metux IT consult	408a4a06bd	CI: speed up solaris build (pre-baked -build image, batched pkg install) ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-14 13:56:46 +02:00
Enrico Weigelt, metux IT consult	bad0d97865	CI: pin go-x11proto to v0.0.8 instead of master ... Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-14 12:55:06 +02:00
Peter Hutterer	8a09b80700	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-14 11:54:22 +02:00
Enrico Weigelt, metux IT consult	6b1a33e91e	Revert "include: move CONFIG_BSD_CONSOLE into xlibre-xserver.h" ... This reverts commit cbbac38918. It was a dead end: the symbol already *has* been in xlibre-xserver.h, but that change moved it into the private xorg-config.h. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-14 10:45:23 +02:00
Peter Hutterer	08638631d3	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-13 16:08:15 +02:00
Peter Hutterer	e759bd7107	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-13 16:07:52 +02:00
Enrico Weigelt, metux IT consult	cbbac38918	include: move CONFIG_BSD_CONSOLE into xlibre-xserver.h ... the classic keyboard driver needs it defined on BSD systems. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-13 12:49:52 +02:00
r1w1s1	9a8fcbd960	xfree86: guard libdrm usage with WITH_LIBDRM	2026-07-09 12:56:22 +02:00
Ben Skeggs	46f706d2e9	xfree86: use modesetting driver by default on GeForce 8 and newer ... Signed-off-by: Ben Skeggs <bskeggs@redhat.com>	2026-07-09 12:56:22 +02:00
Enrico Weigelt, metux IT consult	c03bc789ae	dri2: fix off-by-one heap overflow in do_get_buffers() buffer array ... The buffers array was sized min(count, DRI2BufferHiz) + 1, but count is already capped at DRI2BufferHiz + 1 by the check above. The min() only changes anything at that exact boundary (count == DRI2BufferHiz + 1), where it throws away the array's '+1 slack' right when the main loop can legitimately fill all 'count' slots itself, leaving no room for a synthesized real/fake front buffer the client didn't explicitly request. Trigger: a DRI2-capable client sends DRI2GetBuffers/DRI2GetBuffersWithFormat with 11 attachment entries (the maximum allowed), none of them DRI2BufferFrontLeft but at least one DRI2BufferBackLeft (so need_real_front ends up set) -- the post-loop synthesis writes buffers[11], one past the 11-element allocation. Deterministic, no OOM required. Fix: allocate count + 1 slots unconditionally; count is already bounded, so this is never a meaningfully larger allocation. Found via a fleet-directed alloc-fail/UAF sweep of Xext/, not from a live crash report. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-09 12:56:04 +02:00
Enrico Weigelt, metux IT consult	4016148b81	os: gate SVR4-only socket headers on HAVE_SYS_*_H, not SVR4 ... <sys/filio.h>, <sys/sockio.h> and <sys/stropts.h> were included under the grab-bag SVR4 / __SVR4 OS macro. Whether these headers exist is a per-header question, so probe them directly: - conf_data gains HAVE_SYS_FILIO_H / HAVE_SYS_SOCKIO_H / HAVE_SYS_STROPTS_H via cc.has_header (alongside the other HAVE_SYS_*_H checks), - os/Xtranssock.c gates <sys/filio.h> on HAVE_SYS_FILIO_H, - os/access.c gates <sys/sockio.h> on HAVE_SYS_SOCKIO_H and <sys/stropts.h> on HAVE_SYS_STROPTS_H (split into independent guards since they are now independent probes). <sys/stropts.h> is SVR4/Solaris-only, so its check is exactly equivalent to the old SVR4 guard. <sys/filio.h> and <sys/sockio.h> also exist on the BSDs, so they are now correctly included there too (they provide the FIO*/SIOC* ioctls and are idempotent — the BSD <sys/ioctl.h> already pulls them in), which is the intended "include it where it exists" behaviour rather than "only on SVR4". Verified: Linux -Dwerror=true build gets all three as #undef (none of the headers exist there, identical to SVR4 being undefined) and links Xvfb and Xnest cleanly. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-07 13:29:44 +02:00
Enrico Weigelt, metux IT consult	32a02ab792	os: Xtranssock: brace set_sun_path()'s if bodies ... Mechanical, brace-only conversion of set_sun_path()'s previously unbraced single-statement if bodies, per the always-brace-if/while/for coding-style policy. No logic changes. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>	2026-07-07 12:00:39 +02:00
stefan11111	0c0f8c919f	kdrive/fbdev: Bump the fallback refresh rate to 120 ... There are now modes in the list with 120 hz refresh rate Signed-off-by: stefan11111 <stefan11111github@gmail.com>	2026-07-07 11:27:04 +02:00
stefan11111	c58bd67c7c	kdrive: Add a comment about the existing 1280x854 mode, and add one with good timings ... Signed-off-by: stefan11111 <stefan11111github@gmail.com>	2026-07-07 11:27:04 +02:00
stefan11111	e6744aba44	kdrive: Don't skip resolutions in KdTuneMode ... Signed-off-by: stefan11111 <stefan11111github@gmail.com>	2026-07-07 11:27:04 +02:00
stefan11111	87de221f4e	kdrive: Add a bunch of VESA standard modes ... The modes are taken from https://glenwing.github.io/docs/VESA-DMT-1.13.pdf Notably, this adds common modes like 720p, 1080p, and 4k Also fixed the ordering of a few modes, and some incorrect timings Signed-off-by: stefan11111 <stefan11111github@gmail.com>	2026-07-07 11:27:04 +02:00
stefan11111	0f3692a294	kdrive: Warn in KdAddMode if we run out of space ... Signed-off-by: stefan11111 <stefan11111github@gmail.com>	2026-07-07 11:27:04 +02:00