Skip to content
Snippets Groups Projects
Commit 56b45e6b authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

remove useless patch, cosmetic change at xorg-server.install

parent a2670342
No related branches found
No related tags found
No related merge requests found
From 919f1f46fc67dae93b2b3f278fcbfc77af34ec58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Mon, 31 Aug 2020 12:10:43 +0200
Subject: [PATCH] xfree86: Take second reference for SavedCursor in
xf86CursorSetCursor
The same pointer is kept in CurrentCursor as well, therefore two
RefCursor calls are needed.
Fixes use-after-free after switching VTs.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
---
hw/xfree86/ramdac/xf86CursorRD.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/xfree86/ramdac/xf86CursorRD.c b/hw/xfree86/ramdac/xf86CursorRD.c
index 9aa3de97b..c8362d169 100644
--- a/hw/xfree86/ramdac/xf86CursorRD.c
+++ b/hw/xfree86/ramdac/xf86CursorRD.c
@@ -334,6 +334,9 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
ScreenPriv->HotY = cursor->bits->yhot;
if (!infoPtr->pScrn->vtSema) {
+ cursor = RefCursor(cursor);
+ if (ScreenPriv->SavedCursor)
+ FreeCursor(ScreenPriv->SavedCursor, None);
ScreenPriv->SavedCursor = cursor;
return;
}
--
2.28.0
post_upgrade() {
post_install
}
post_install() { post_install() {
## suid permission is not preserved during _install execution, fix it. ## suid permission is not preserved during _install execution, fix it.
cat <<MSG
>>> Applying 4755 mode to /usr/lib/Xorg.wrag
MSG
chmod u+s /usr/lib/Xorg.wrap chmod u+s /usr/lib/Xorg.wrap
cat <<MSG cat <<MSG
...@@ -21,3 +20,7 @@ $(tput setaf 3)>>> WARNING: $(tput sgr0) ...@@ -21,3 +20,7 @@ $(tput setaf 3)>>> WARNING: $(tput sgr0)
See xorg.wrap man page (man xorg.wrap) for futher informations. See xorg.wrap man page (man xorg.wrap) for futher informations.
MSG MSG
} }
post_upgrade() {
post_install
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment