import xorg-x11-server-1.20.11-5.el8
This commit is contained in:
parent
e86400045a
commit
0bc0cd3e15
|
@ -0,0 +1,43 @@
|
||||||
|
From 94b4a3d45451d29e9539ea234ce8b5e9ed58546c Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
|
||||||
|
Date: Thu, 13 Jan 2022 00:47:27 +0100
|
||||||
|
Subject: [PATCH xserver] present: Check for NULL to prevent crash
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1275
|
||||||
|
Signed-off-by: Błażej Szczygieł <spaz16@wp.pl>
|
||||||
|
Tested-by: Aaron Plattner <aplattner@nvidia.com>
|
||||||
|
(cherry picked from commit 22d5818851967408bb7c903cb345b7ca8766094c)
|
||||||
|
---
|
||||||
|
present/present_scmd.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/present/present_scmd.c b/present/present_scmd.c
|
||||||
|
index 3c68e690b..11391adbb 100644
|
||||||
|
--- a/present/present_scmd.c
|
||||||
|
+++ b/present/present_scmd.c
|
||||||
|
@@ -168,6 +168,9 @@ present_scmd_get_crtc(present_screen_priv_ptr screen_priv, WindowPtr window)
|
||||||
|
if (!screen_priv->info)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
+ if (!screen_priv->info->get_crtc)
|
||||||
|
+ return NULL;
|
||||||
|
+
|
||||||
|
return (*screen_priv->info->get_crtc)(window);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -206,6 +209,9 @@ present_flush(WindowPtr window)
|
||||||
|
if (!screen_priv->info)
|
||||||
|
return;
|
||||||
|
|
||||||
|
+ if (!screen_priv->info->flush)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
(*screen_priv->info->flush) (window);
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.34.1
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
Summary: X.Org X11 X server
|
Summary: X.Org X11 X server
|
||||||
Name: xorg-x11-server
|
Name: xorg-x11-server
|
||||||
Version: 1.20.11
|
Version: 1.20.11
|
||||||
Release: 4%{?gitdate:.%{gitdate}}%{?dist}
|
Release: 5%{?gitdate:.%{gitdate}}%{?dist}
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
|
@ -109,6 +109,7 @@ Patch201: 0001-linux-Fix-platform-device-PCI-detection-for-complex-.patch
|
||||||
Patch202: 0001-modesetting-Reduce-glamor-initialization-failed-mess.patch
|
Patch202: 0001-modesetting-Reduce-glamor-initialization-failed-mess.patch
|
||||||
Patch203: 0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch
|
Patch203: 0001-xfree86-Only-switch-to-original-VT-if-it-is-active.patch
|
||||||
Patch204: 0001-xf86-logind-Fix-drm_drop_master-before-vt_reldisp.patch
|
Patch204: 0001-xf86-logind-Fix-drm_drop_master-before-vt_reldisp.patch
|
||||||
|
Patch205: 0001-present-Check-for-NULL-to-prevent-crash.patch
|
||||||
|
|
||||||
# CVE-2021-4011
|
# CVE-2021-4011
|
||||||
Patch10009: 0001-record-Fix-out-of-bounds-access-in-SwapCreateRegiste.patch
|
Patch10009: 0001-record-Fix-out-of-bounds-access-in-SwapCreateRegiste.patch
|
||||||
|
@ -544,6 +545,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 28 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-5
|
||||||
|
- Fix crash with NVIDIA proprietary driver with Present (#2046329)
|
||||||
|
|
||||||
* Thu Jan 6 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-4
|
* Thu Jan 6 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.20.11-4
|
||||||
- CVE fix for: CVE-2021-4008 (#2030162), CVE-2021-4009 (#2030172),
|
- CVE fix for: CVE-2021-4008 (#2030162), CVE-2021-4009 (#2030172),
|
||||||
CVE-2021-4010 (#2030175), CVE-2021-4011 (#2030181)
|
CVE-2021-4010 (#2030175), CVE-2021-4011 (#2030181)
|
||||||
|
|
Loading…
Reference in New Issue