From 756449e397e436af861b099b1798158010ea2aa4 Mon Sep 17 00:00:00 2001 From: xuyan Date: Thu, 24 Jul 2025 09:49:58 +0800 Subject: [PATCH] phytium: xfree86: Fix possible Xorg crashes for ps23xx when using ast and pe2201 bmc card Signed-off-by: xuyan (cherry picked from commit dfbf11787e474c7e237902b35d45ad3fead3f010) --- ...um-xfree86-Fixed-display-error-for-ps23xx-when-.patch | 8 ++++---- xorg-x11-server.spec | 9 ++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/0025-phytium-xfree86-Fixed-display-error-for-ps23xx-when-.patch b/0025-phytium-xfree86-Fixed-display-error-for-ps23xx-when-.patch index 4ae04a3..5338bb1 100644 --- a/0025-phytium-xfree86-Fixed-display-error-for-ps23xx-when-.patch +++ b/0025-phytium-xfree86-Fixed-display-error-for-ps23xx-when-.patch @@ -22,7 +22,7 @@ index ef4a314..f9555e4 100644 return dirty; } -+static void align_memcpy(void *dest, void *source, size_t size) ++static void align_memmove(void *dest, void *source, size_t size) +{ + char *dst1, *dst2, *p, *src, *dst; + @@ -38,7 +38,7 @@ index ef4a314..f9555e4 100644 + size--; + }; + -+ memcpy(dst1, (char *)src, (size & (~0xf))); ++ memmove(dst1, (char *)src, (size & (~0xf))); + + src += (size & (~0xf)); + size = (size & 0xf); @@ -165,9 +165,9 @@ index ef4a314..f9555e4 100644 + width -= i; + scr += i; + if ((isFtBMC || isAstBMC) && forceAlign) { -+ align_memcpy(win, sha, i * sizeof(FbBits)); ++ align_memmove(win, sha, i * sizeof(FbBits)); + } else { -+ memcpy(win, sha, i * sizeof(FbBits)); ++ memmove(win, sha, i * sizeof(FbBits)); + } + sha += i; + } diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 69121cf..10d4dd7 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -16,7 +16,7 @@ Name: xorg-x11-server Version: 1.20.11 -Release: 40 +Release: 41 Summary: X.Org X11 X server License: MIT and GPLv2 URL: https://www.x.org @@ -482,6 +482,13 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %{_mandir}/man*/* %changelog + +* Thu Jul 24 2025 xuyan - 1.20.11-41 +- Type:feature +- CVE:NA +- SUG:NA +- DESC:Fix possible Xorg crashes for ps23xx when using ast and pe2201 bmc card. + * Mon Jul 21 2025 wangqingzheng - 1.20.11-40 - Fix CVE-2025-49176 -- Gitee