Attachment 35598 Details for Bug 27114 – Proposed patch to eliminate potential loop in EnterVT function pointer

[patch] Proposed patch to eliminate potential loop in EnterVT function pointer

0001-Clean-up-RandR12-bits-on-screen-close-bug-27114.patch (text/plain), 2.91 KB, created by Keith Packard on 2010-05-12 11:31:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Packard

Created: 2010-05-12 11:31:42 UTC

Size: 2.91 KB

patch

obsolete

>From b42d55f14f2c4f79fc20cb7ab0a48cbaf05b7951 Mon Sep 17 00:00:00 2001
>From: Keith Packard <keithp@keithp.com>
>Date: Fri, 7 May 2010 22:56:04 -0700
>Subject: [PATCH] Clean up RandR12 bits on screen close (bug 27114)
>
>When resetting the server, pScrn->EnterVT must be unwrapped or the
>next server generation will end up wrapping the wrapper and causing an
>infinite recursion on EnterVT.
>
>Signed-off-by: Keith Packard <keithp@keithp.com>
>---
> hw/xfree86/modes/xf86Crtc.c    |    2 ++
> hw/xfree86/modes/xf86RandR12.c |   26 +++++++++++++++++++++++++-
> hw/xfree86/modes/xf86RandR12.h |    1 +
> 3 files changed, 28 insertions(+), 1 deletions(-)
>
>diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
>index 1ccaffc..bea2594 100644
>--- a/hw/xfree86/modes/xf86Crtc.c
>+++ b/hw/xfree86/modes/xf86Crtc.c
>@@ -752,6 +752,8 @@ xf86CrtcCloseScreen (int index, ScreenPtr screen)
> 
> 	crtc->randr_crtc = NULL;
>     }
>+    xf86RandR12CloseScreen (screen);
>+
>     return screen->CloseScreen (index, screen);
> }
> 
>diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
>index 8898f4d..0264f78 100644
>--- a/hw/xfree86/modes/xf86RandR12.c
>+++ b/hw/xfree86/modes/xf86RandR12.c
>@@ -926,6 +926,24 @@ xf86RandR12Init (ScreenPtr pScreen)
> }
> 
> void
>+xf86RandR12CloseScreen (ScreenPtr pScreen)
>+{
>+    XF86RandRInfoPtr	randrp;
>+
>+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
>+    if (xf86RandR12Key == NULL)
>+	return;
>+#endif
>+
>+    randrp = XF86RANDRINFO(pScreen);
>+#if RANDR_12_INTERFACE
>+    xf86Screens[pScreen->myNum]->EnterVT = randrp->orig_EnterVT;
>+#endif
>+
>+    xfree(randrp);
>+}
>+
>+void
> xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)
> {
>     XF86RandRInfoPtr	randrp;
>@@ -1753,10 +1771,16 @@ static Bool
> xf86RandR12EnterVT (int screen_index, int flags)
> {
>     ScreenPtr        pScreen = screenInfo.screens[screen_index];
>+    ScrnInfoPtr	     pScrn = xf86Screens[screen_index];
>     XF86RandRInfoPtr randrp  = XF86RANDRINFO(pScreen);
>+    Bool	     ret;
> 
>     if (randrp->orig_EnterVT) {
>-	if (!randrp->orig_EnterVT (screen_index, flags))
>+	pScrn->EnterVT = randrp->orig_EnterVT;
>+	ret = pScrn->EnterVT (screen_index, flags);
>+	randrp->orig_EnterVT = pScrn->EnterVT;
>+	pScrn->EnterVT = xf86RandR12EnterVT;
>+	if (!ret)
> 	    return FALSE;
>     }
> 
>diff --git a/hw/xfree86/modes/xf86RandR12.h b/hw/xfree86/modes/xf86RandR12.h
>index c8d9918..0c586be 100644
>--- a/hw/xfree86/modes/xf86RandR12.h
>+++ b/hw/xfree86/modes/xf86RandR12.h
>@@ -30,6 +30,7 @@
> 
> extern _X_EXPORT Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen);
> extern _X_EXPORT Bool xf86RandR12Init(ScreenPtr pScreen);
>+extern _X_EXPORT void xf86RandR12CloseScreen(ScreenPtr pScreen);
> extern _X_EXPORT void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotation);
> extern _X_EXPORT void xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms);
> extern _X_EXPORT Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation, int rate,
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 27114: 35598

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.