mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 09:49:33 +02:00
xserver-xorg: Fix for CVE-2025-62230
Upstream-Status: Backport from865089ca70&87fe255393(From OE-Core rev: 215d63fd22b40148625215aac5c4e7f2629f5814) Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Vijay Anusuri
committed by
Steve Sakoman
Steve Sakoman
parent
6b397fb207
commit
73e3da5d44
@@ -0,0 +1,63 @@
|
|||||||
|
From 865089ca70840c0f13a61df135f7b44a9782a175 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
||||||
|
Date: Wed, 10 Sep 2025 15:55:06 +0200
|
||||||
|
Subject: [PATCH] xkb: Make the RT_XKBCLIENT resource private
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Currently, the resource in only available to the xkb.c source file.
|
||||||
|
|
||||||
|
In preparation for the next commit, to be able to free the resources
|
||||||
|
from XkbRemoveResourceClient(), make that variable private instead.
|
||||||
|
|
||||||
|
This is related to:
|
||||||
|
|
||||||
|
CVE-2025-62230, ZDI-CAN-27545
|
||||||
|
|
||||||
|
This vulnerability was discovered by:
|
||||||
|
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
|
||||||
|
|
||||||
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
||||||
|
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
|
||||||
|
(cherry picked from commit 99790a2c9205a52fbbec01f21a92c9b7f4ed1d8f)
|
||||||
|
|
||||||
|
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2087>
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/865089ca70840c0f13a61df135f7b44a9782a175]
|
||||||
|
CVE: CVE-2025-62230
|
||||||
|
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
|
||||||
|
---
|
||||||
|
include/xkbsrv.h | 2 ++
|
||||||
|
xkb/xkb.c | 2 +-
|
||||||
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
|
||||||
|
index fbb5427e1c..b2766277cf 100644
|
||||||
|
--- a/include/xkbsrv.h
|
||||||
|
+++ b/include/xkbsrv.h
|
||||||
|
@@ -58,6 +58,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
#include "inputstr.h"
|
||||||
|
#include "events.h"
|
||||||
|
|
||||||
|
+extern RESTYPE RT_XKBCLIENT;
|
||||||
|
+
|
||||||
|
typedef struct _XkbInterest {
|
||||||
|
DeviceIntPtr dev;
|
||||||
|
ClientPtr client;
|
||||||
|
diff --git a/xkb/xkb.c b/xkb/xkb.c
|
||||||
|
index 5131bfcdf7..26d965d482 100644
|
||||||
|
--- a/xkb/xkb.c
|
||||||
|
+++ b/xkb/xkb.c
|
||||||
|
@@ -51,7 +51,7 @@ int XkbKeyboardErrorCode;
|
||||||
|
CARD32 xkbDebugFlags = 0;
|
||||||
|
static CARD32 xkbDebugCtrls = 0;
|
||||||
|
|
||||||
|
-static RESTYPE RT_XKBCLIENT;
|
||||||
|
+RESTYPE RT_XKBCLIENT = 0;
|
||||||
|
|
||||||
|
/***====================================================================***/
|
||||||
|
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
From 87fe2553937a99fd914ad0cde999376a3adc3839 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Olivier Fourdan <ofourdan@redhat.com>
|
||||||
|
Date: Wed, 10 Sep 2025 15:58:57 +0200
|
||||||
|
Subject: [PATCH] xkb: Free the XKB resource when freeing XkbInterest
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
XkbRemoveResourceClient() would free the XkbInterest data associated
|
||||||
|
with the device, but not the resource associated with it.
|
||||||
|
|
||||||
|
As a result, when the client terminates, the resource delete function
|
||||||
|
gets called and accesses already freed memory:
|
||||||
|
|
||||||
|
| Invalid read of size 8
|
||||||
|
| at 0x5BC0C0: XkbRemoveResourceClient (xkbEvents.c:1047)
|
||||||
|
| by 0x5B3391: XkbClientGone (xkb.c:7094)
|
||||||
|
| by 0x4DF138: doFreeResource (resource.c:890)
|
||||||
|
| by 0x4DFB50: FreeClientResources (resource.c:1156)
|
||||||
|
| by 0x4A9A59: CloseDownClient (dispatch.c:3550)
|
||||||
|
| by 0x5E0A53: ClientReady (connection.c:601)
|
||||||
|
| by 0x5E4FEF: ospoll_wait (ospoll.c:657)
|
||||||
|
| by 0x5DC834: WaitForSomething (WaitFor.c:206)
|
||||||
|
| by 0x4A1BA5: Dispatch (dispatch.c:491)
|
||||||
|
| by 0x4B0070: dix_main (main.c:277)
|
||||||
|
| by 0x4285E7: main (stubmain.c:34)
|
||||||
|
| Address 0x1893e278 is 184 bytes inside a block of size 928 free'd
|
||||||
|
| at 0x4842E43: free (vg_replace_malloc.c:989)
|
||||||
|
| by 0x49C1A6: CloseDevice (devices.c:1067)
|
||||||
|
| by 0x49C522: CloseOneDevice (devices.c:1193)
|
||||||
|
| by 0x49C6E4: RemoveDevice (devices.c:1244)
|
||||||
|
| by 0x5873D4: remove_master (xichangehierarchy.c:348)
|
||||||
|
| by 0x587921: ProcXIChangeHierarchy (xichangehierarchy.c:504)
|
||||||
|
| by 0x579BF1: ProcIDispatch (extinit.c:390)
|
||||||
|
| by 0x4A1D85: Dispatch (dispatch.c:551)
|
||||||
|
| by 0x4B0070: dix_main (main.c:277)
|
||||||
|
| by 0x4285E7: main (stubmain.c:34)
|
||||||
|
| Block was alloc'd at
|
||||||
|
| at 0x48473F3: calloc (vg_replace_malloc.c:1675)
|
||||||
|
| by 0x49A118: AddInputDevice (devices.c:262)
|
||||||
|
| by 0x4A0E58: AllocDevicePair (devices.c:2846)
|
||||||
|
| by 0x5866EE: add_master (xichangehierarchy.c:153)
|
||||||
|
| by 0x5878C2: ProcXIChangeHierarchy (xichangehierarchy.c:493)
|
||||||
|
| by 0x579BF1: ProcIDispatch (extinit.c:390)
|
||||||
|
| by 0x4A1D85: Dispatch (dispatch.c:551)
|
||||||
|
| by 0x4B0070: dix_main (main.c:277)
|
||||||
|
| by 0x4285E7: main (stubmain.c:34)
|
||||||
|
|
||||||
|
To avoid that issue, make sure to free the resources when freeing the
|
||||||
|
device XkbInterest data.
|
||||||
|
|
||||||
|
CVE-2025-62230, ZDI-CAN-27545
|
||||||
|
|
||||||
|
This vulnerability was discovered by:
|
||||||
|
Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
|
||||||
|
|
||||||
|
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
||||||
|
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
|
||||||
|
(cherry picked from commit 10c94238bdad17c11707e0bdaaa3a9cd54c504be)
|
||||||
|
|
||||||
|
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2087>
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/87fe2553937a99fd914ad0cde999376a3adc3839]
|
||||||
|
CVE: CVE-2025-62230
|
||||||
|
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
|
||||||
|
---
|
||||||
|
xkb/xkbEvents.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
|
||||||
|
index 0bbd661867..3d04ecf0c4 100644
|
||||||
|
--- a/xkb/xkbEvents.c
|
||||||
|
+++ b/xkb/xkbEvents.c
|
||||||
|
@@ -1056,6 +1056,7 @@ XkbRemoveResourceClient(DevicePtr inDev, XID id)
|
||||||
|
autoCtrls = interest->autoCtrls;
|
||||||
|
autoValues = interest->autoCtrlValues;
|
||||||
|
client = interest->client;
|
||||||
|
+ FreeResource(interest->resource, RT_XKBCLIENT);
|
||||||
|
free(interest);
|
||||||
|
found = TRUE;
|
||||||
|
}
|
||||||
|
@@ -1067,6 +1068,7 @@ XkbRemoveResourceClient(DevicePtr inDev, XID id)
|
||||||
|
autoCtrls = victim->autoCtrls;
|
||||||
|
autoValues = victim->autoCtrlValues;
|
||||||
|
client = victim->client;
|
||||||
|
+ FreeResource(victim->resource, RT_XKBCLIENT);
|
||||||
|
free(victim);
|
||||||
|
found = TRUE;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
@@ -45,6 +45,8 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat
|
|||||||
file://CVE-2025-49180-1.patch \
|
file://CVE-2025-49180-1.patch \
|
||||||
file://CVE-2025-49180-2.patch \
|
file://CVE-2025-49180-2.patch \
|
||||||
file://CVE-2025-62229.patch \
|
file://CVE-2025-62229.patch \
|
||||||
|
file://CVE-2025-62230-1.patch \
|
||||||
|
file://CVE-2025-62230-2.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152"
|
SRC_URI[sha256sum] = "38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user