Commit Graph

502 Commits

Author SHA1 Message Date
matthieu
dd403c0ad1 Update to xserver 21.1.18.
The security fixes have already been committed.
2025-06-29 05:21:57 +00:00
matthieu
4607666e18 Check for integer overflow on BigRequest length.
Related to CVE-2025-49176.
2025-06-19 05:16:21 +00:00
matthieu
e8f2e774ea Merge fixes from upstream for multiple Xserver issues:
CVE-2025-49175: Out-of-bounds access in X Rendering extension
    (Animated cursors)
CVE-2025-49176: Integer overflow in Big Requests Extension
CVE-2025-49177: Data leak in XFIXES Extension 6
    (XFixesSetClientDisconnectMode)
CVE-2025-49178: Unprocessed client request via bytes to ignore
CVE-2025-49179: Integer overflow in X Record extension
CVE-2025-49180: Integer overflow in RandR extension
    (RRChangeProviderProperty)
2025-06-17 13:10:07 +00:00
matthieu
c466e1c79a Backport the remaining bits of the modesetting driver in X.org master.
Work done by tedu@.
2025-06-14 12:29:51 +00:00
matthieu
dd8895c038 Backport TearFree page flips for the modesetting driver from X.Org maaster.
Work done by jcs@ and naddy@. This is the TearFree code alone as of
2023-12-17.
2025-06-14 12:22:29 +00:00
matthieu
9cdf3166a0 Revert the tearfree commit. It contains a merge error noticed by nadd@
It will be re-done without the merge error.
2025-06-14 12:16:56 +00:00
matthieu
b454d6cc15 Backport TearFree page flips for the modesetting driver from X.Org maaster.
Work done by tedu@ based on previous diffs by jcs@ and stsp@.
One bug fix in master by me. tested and ok tb@. commit on behalf of tedu@
2025-06-09 18:18:36 +00:00
matthieu
3cfba1062d Update to xserver 21.1.16.
The security fixes were committed earlier. This is the rest of the
21.1.16 update.
2025-03-02 09:09:28 +00:00
matthieu
04a5e9b4d8 Security fixes from X.Org advisory o February 25, 2025:
CVE-2025-26594: Use-after-free of the root cursor
CVE-2025-26595: Buffer overflow in XkbVModMaskText()
CVE-2025-26596: Heap overflow in XkbWriteKeySyms()
CVE-2025-26597: Buffer overflow in XkbChangeTypesOfKey()
CVE-2025-26598: Out-of-bounds write in CreatePointerBarrierClient()
CVE-2025-26599: Use of uninitialized pointer in compRedirectWindow()
CVE-2025-26600: Use-after-free in PlayReleasedEvents()
CVE-2025-26601: Use-after-free in SyncInitTrigger()
2025-02-25 15:52:12 +00:00
matthieu
443f1bf956 Update to xserver 21.1.15 2024-12-22 08:26:03 +00:00
matthieu
8886fdf68b Update to xserver 21.1.14. tested by tb@
The xkb security fix was committed earlier. This is the rest of the
21.1.14 update.
2024-11-05 08:13:05 +00:00
sthen
2be848d404 Don't log DDC modelines (after hotplug events/xrandr) or "Using XX ranges
from config file" messages. These were printed after hotplug events which
could be frequent in some cases (I have machines where this happens every
10 seconds when the monitor is in a dpms power-saving mode resulting in a
full /var/log filesystem).

EDID vendor/product ID still logged, giving an indication that events are
happening, but reduced from ~3.5KB per event to <100 bytes.

based on a diff from / ok matthieu@
2024-10-31 11:54:14 +00:00
matthieu
81fd437204 xkb: Fix buffer overflow in _XkbSetCompatMap()
The _XkbSetCompatMap() function attempts to resize the `sym_interpret`
buffer.

However, It didn't update its size properly. It updated `num_si` only,
without updating `size_si`.

CVE-2024-9632
2024-10-29 17:58:22 +00:00
matthieu
84e815349b Reduce diff with upstream. 2024-08-16 07:45:15 +00:00
matthieu
d80f4a5383 Ansify function declarations. These are all simple () -> (void) cases. 2024-08-16 07:24:52 +00:00
matthieu
3cb0af1088 Reduce white space diff with upstream. 2024-08-15 19:07:07 +00:00
matthieu
1a4fe3ee9f Remove 2 files that were missed on xserver 21.1 update (which removed Xdmx) 2024-08-04 08:06:49 +00:00
matthieu
fd4bb1c62e Replace __OpenBSD__ with X_PRIVSEP in check for priv_open_device() 2024-08-04 08:02:04 +00:00
matthieu
22034bbc35 Remove white space only diff with upstream 2024-08-04 07:53:57 +00:00
matthieu
d707307866 Update to xserver 21.1.13. 2024-04-27 17:37:14 +00:00
matthieu
72350a0520 Update to xserver 21.1.12
The security patches were already commited, sync with the rest
of the 21.1.12 relase.
2024-04-07 11:42:56 +00:00
matthieu
a9b0c2567c The DMX extension was removed in xserver 21.1. 2024-04-07 06:31:07 +00:00
matthieu
300e0e3cf4 Fix refcounting of glyphs during ProcRenderAddGlyphs() (CVE-2024-31083) 2024-04-03 16:27:34 +00:00
matthieu
a56b04ec0c Need to use unswapped length to send reply in
ProcXIGetSelectedEvents() (CVE-2024-31080) and
ProcXiPassiveGrabDevice() (CVE-2024-31081)
2024-04-03 16:26:45 +00:00
matthieu
9ad627f7b7 Update to xserver 21.1.11.
All the security fixes have already been committed.
2024-01-28 09:58:04 +00:00
kettenis
669d3297eb WSDISPLAY_TYPE_RKDRM was renamed to WSDISPLAY_TYPE_KMS 2024-01-19 17:52:03 +00:00
matthieu
a631224042 Multiple issues have been found in the X server and Xwayland
implementations:

1) CVE-2023-6816 can be triggered by passing an invalid array index to
DeviceFocusEvent or ProcXIQueryPointer.

2) CVE-2024-0229 can be triggered if a device has both a button and a
key class and zero buttons.

3) CVE-2024-21885 can be triggered if a device with a given ID was
removed and a new device with the same ID added both in the same
operation.

4) CVE-2024-21886 can be triggered by disabling a master device with
disabled slave devices.

5) CVE-2024-0409 can be triggered by enabling SELinux
xserver_object_manager and running a client.

6) CVE-2024-0408 can be triggered by enabling SELinux
xserver_object_manager and creating a GLX PBuffer.
2024-01-16 12:34:23 +00:00
matthieu
6367cbe266 Update xserver to 21.1.10.
The security fixes have already been committed.
2024-01-07 11:11:57 +00:00
matthieu
f33da8b94d The previous fix from X.Org was incorrect. This fixes it.
Xi: allocate enough XkbActions for our buttons
CVE-2023-6377
2023-12-13 06:34:18 +00:00
matthieu
679d2a4fc6 randr: avoid integer truncation in length check of ProcRRChange*Property
CVE-2023-6478
2023-12-13 06:21:57 +00:00
matthieu
1df2839930 Xi: allocate enough XkbActions for our buttons
CVE-2023-6377
2023-12-13 06:20:16 +00:00
matthieu
f9c3f64c48 Update to xserver 21.1.9.
All the security patches have already been committed.
Udated autoconf to 2.71 explains the large build infrastructure diff.
2023-10-29 16:45:32 +00:00
matthieu
39b5220750 Fix several input validation errors in the X server
CVE-2023-5367 CVE-2023-5380 CVE-2023-5574
2023-10-25 05:16:39 +00:00
matthieu
d65f6ec688 Fix out of bounds write in glamor_xv_query_image_attributes for NV12
image format. This is a format with num_planes == 2, so we have only 2
elements in offsets[] and pitches[].

Bug found by otto@ using his strict malloc checking.
2023-09-20 18:27:00 +00:00
matthieu
fb763cc6fe Revert previous:
unbreak build with clang-16 by fixing up function definitions to match
the whole CARD64 vs uint64_t issue needs more thinking.
Suggested by kettenis@
2023-09-08 05:44:27 +00:00
robert
09bc32815c unbreak build with clang-16 by fixing up function definitions to match
our uint64_t is an unsinged long long, but CARD64 is defined as unsigned long
so the function pointer types in both glamor and xf86-video-amdgpu were
mismatched and clang-16 treats that as an error

ok matthieu@
2023-09-06 11:42:37 +00:00
miod
a012b5de33 Make sure we don't close(-1); buglet introduced in 1.26.
ok matthieu@
2023-08-12 16:16:25 +00:00
matthieu
737e223ef8 Merge X server 21.1.8. tested by kn@ and op@. 2023-05-01 07:41:17 +00:00
matthieu
1a68187e4c composite: Fix use-after-free of the COW
CVE-2023-1393, ZDI-CAN-19866
2023-03-29 12:12:13 +00:00
matthieu
1322100d79 Xi: fix use-after-free in DeepCopyPointerClasses
CVE-2023-0494, ZDI-CAN-19596
2023-02-07 06:32:18 +00:00
matthieu
6c8ea4fe58 Merge xserver 21.1.6.
Includes a few fixes to the security patches already committed.
2023-01-22 09:44:41 +00:00
matthieu
8c4424dd36 Add back the meson build system to xserver.
Not having those file only create noise when merging upstream releases.
2023-01-22 09:21:08 +00:00
matthieu
49a1671770 Fix serveral X server input validation errors that can cause varios issues:
* CVE-2022-46340/ZDI-CAN-19265: X.Org Server XTestSwapFakeInput stack
  overflow
* CVE-2022-46341/ZDI-CAN-19381: X.Org Server XIPassiveUngrab
  out-of-bounds access
* CVE-2022-46342/ZDI-CAN-19400: X.Org Server XvdiSelectVideoNotify
  use-after-free
* CVE-2022-46343/ZDI-CAN-19404: X.Org Server ScreenSaverSetAttributes
  use-after-free
* CVE-2022-46344/ZDI-CAN-19405: X.Org Server XIChangeProperty
  out-of-bounds access
* CVE-2022-46283/ZDI-CAN-19530: X.Org Server XkbGetKbdByName use-after-free
2022-12-14 10:29:00 +00:00
matthieu
fd3c33bec8 Don't crash if the client argv or argv[0] is NULL.
Report from  bauerm at pestilenz dot org.
With help from and ok millert@
2022-11-11 13:56:12 +00:00
matthieu
68328bb5ec Update xserver to version 21.1.4.
The security patches were already committed as part of july 24 errata.
This brings a few other bug fixes.
Tested by Walter Alejandro Iglesias.
2022-08-31 11:25:18 +00:00
matthieu
6bd883d148 MFC: Multiple input validation failures in X server extensions
CVE-2022-2319/ZDI-CAN-16062 ProcXkbSetGeometry Out-Of-Bounds Access
CVE-2022-2320/ZDI-CAN-16070 ProcXkbSetDeviceInfo Out-Of-Bounds Access
2022-07-12 19:18:14 +00:00
matthieu
8a0d473d7b Sync with xorg-server 21.1.3.
This does *not* include the commit that reverts the new computation
of the screen resolution from dimensions returned by the screen since
many of you told they prefer the new behaviour from 21.1.1.

This is going to be discussed again before 7.1
2022-02-20 17:41:34 +00:00
jsg
f2d69a3523 remove 0x2972 from the intel gen 2 and 3 list
0x2972 is 946GZ which is gen 4
2022-02-03 23:48:52 +00:00
visa
40f054ffd7 Recommit: compiler.h: don't define inb/outb and friends on mips
From Julien Cristau
0148a15da1616a868d71abe1b56e3f28cc79533c in xserver git
without arm_video.c changes.

OK matthieu@
2021-12-27 04:58:36 +00:00
matthieu
c9b690e680 render: Fix out of bounds access in SProcRenderCompositeGlyphs()
ZDI-CAN-14192, CVE-2021-4008
2021-12-14 13:42:47 +00:00