Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2023-01-26 13:57:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server" Thu Jan 26 13:57:05 2023 rev:416 rq:1060975 version:21.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2023-01-01 09:38:23.046622813 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new.32243/xorg-x11-server.changes 2023-01-26 14:12:07.964804959 +0100 @@ -1,0 +2,13 @@ +Wed Jan 25 16:02:23 UTC 2023 - Stefan Dirsch <sndir...@suse.com> + +- rename u_xorg-server-oob-read-enqueue-event.patch to + U_xorg-server-oob-read-enqueue-event.patch since it's already + upstream + +------------------------------------------------------------------- +Wed Jan 25 03:15:56 UTC 2023 - Michael Gorse <mgo...@suse.com> + +- Add u_xorg-server-oob-read-enqueue-event.patch: fix an + out-of-bounds read in EnqueueEvent. + +------------------------------------------------------------------- New: ---- U_xorg-server-oob-read-enqueue-event.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.dc1Qna/_old 2023-01-26 14:12:09.560813543 +0100 +++ /var/tmp/diff_new_pack.dc1Qna/_new 2023-01-26 14:12:09.568813586 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-server # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -207,9 +207,8 @@ Patch12: n_xorg-wrapper-anybody.patch Patch100: u_01-Improved-ConfineToShape.patch Patch101: u_02-DIX-ConfineTo-Don-t-bother-about-the-bounding-box-when-grabbing-a-shaped-window.patch -# PATCH-FIX-UPSTREAM u_x86emu-include-order.patch sch...@suse.de -- Change include order to avoid conflict with system header, remove duplicate definitions - Patch104: u_xorg-server-xdmcp.patch +Patch105: U_xorg-server-oob-read-enqueue-event.patch Patch117: xorg-x11-server-byte-order.patch @@ -371,6 +370,7 @@ %patch100 -p1 #%patch101 -p1 %patch104 -p1 +%patch105 -p1 %patch117 -p1 %patch160 -p1 %patch208 -p1 ++++++ U_xorg-server-oob-read-enqueue-event.patch ++++++ >From 2ef5ef57bd37a8bec2ac454053b283c6f87c3b40 Mon Sep 17 00:00:00 2001 From: Mike Gorse <mgo...@suse.com> Date: Wed, 25 Jan 2023 02:02:48 +0000 Subject: [PATCH] dix: Use CopyPartialInternalEvent in EnqueueEvent The event might be a DeviceEvent allocated on the stack, in AccessXKeyboardEvent for instance. Fixes out-of-bounds read. Signed-off-by: Mike Gorse <mgo...@suse.com> --- dix/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dix/events.c b/dix/events.c index 782ed35dc..86f5357e8 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1215,7 +1215,7 @@ EnqueueEvent(InternalEvent *ev, DeviceIntPtr device) qe->pScreen = pSprite->hotPhys.pScreen; qe->months = currentTime.months; qe->event = (InternalEvent *) (qe + 1); - memcpy(qe->event, event, eventlen); + CopyPartialInternalEvent(qe->event, (InternalEvent *)event); xorg_list_append(&qe->next, &syncEvents.pending); } -- 2.39.0