diff --git a/0001-Fix-the-crash-in-shadowUpdatePacked-because-of-memcp.patch b/0001-Fix-the-crash-in-shadowUpdatePacked-because-of-memcp.patch new file mode 100644 index 0000000000000000000000000000000000000000..7d1334639403ec34f5263ef6242ac8b0405c57d4 --- /dev/null +++ b/0001-Fix-the-crash-in-shadowUpdatePacked-because-of-memcp.patch @@ -0,0 +1,27 @@ +From de7b67924425b3aa540c19c8431ff0d7c5892608 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 24 May 2022 09:49:36 +0800 +Subject: [PATCH] Fix the crash in shadowUpdatePacked because of memcpy acts + randomly with overlapping areas. + +Signed-off-by: tangjie02 +--- + miext/shadow/shpacked.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c +index 5220854..8b16a98 100644 +--- a/miext/shadow/shpacked.c ++++ b/miext/shadow/shpacked.c +@@ -98,7 +98,7 @@ shadowUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) + i = width; + width -= i; + scr += i; +- memcpy(win, sha, i * sizeof(FbBits)); ++ memmove(win, sha, i * sizeof(FbBits)); + sha += i; + } + shaLine += shaStride; +-- +2.33.0 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 1f1fcfa070ace8118a6b00612640cf4db1f3ff59..f03dc276d01f4cae1c7dd30783e7e36233ef4e19 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -16,7 +16,7 @@ Name: xorg-x11-server Version: 1.20.11 -Release: 6 +Release: 7 Summary: X.Org X11 X server License: MIT and GPLv2 URL: https://www.x.org @@ -76,6 +76,8 @@ Patch0025: 0021-xwayland-Fix-emulated-modes-not-being-removed-when-s.patch Patch0026: 0022-xwayland-Call-xwl_window_check_resolution_change_emu.patch Patch0027: 0023-xwayland-Fix-setting-of-_XWAYLAND_RANDR_EMU_MONITOR_.patch Patch0028: 0024-xwayland-Remove-unnecessary-xwl_window_is_toplevel-c.patch + +Patch0100: 0001-Fix-the-crash-in-shadowUpdatePacked-because-of-memcp.patch Patch0029: xorg-s11-server-CVE-2018-20839.patch Patch6000: backport-CVE-2021-4008.patch @@ -84,6 +86,7 @@ Patch6002: backport-CVE-2021-4010.patch Patch6003: backport-CVE-2021-4011.patch Patch6004: backport-rename-bool-to-boolean.patch + BuildRequires: audit-libs-devel autoconf automake bison dbus-devel flex git gcc BuildRequires: systemtap-sdt-devel libtool pkgconfig BuildRequires: xorg-x11-font-utils systemd-devel @@ -426,6 +429,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_mandir}/man*/* %changelog +* Thu Jul 21 2022 tangjie02 - 1.20.11-7 +- Fix the crash in shadowUpdatePacked because of memcpy acts randomly with overlapping areas. + * Fri Jun 24 2022 wangkerong - 1.20.11-6 - disable Xwayland provide by xorg-x11-server-Xwayland - delete the same files of common and help