main/libxxf86vm: fix CVE-2013-2001

ref #1931
fixes #1988

(cherry picked from commit a632a13327ab882c590bbae004b3be338edc14cf)

1 files changed, 28 insertions, 0 deletions

diff --git a/main/libxxf86vm/0004-Unlock-display-before-returning-alloc-error-in-XF86V.patch b/main/libxxf86vm/0004-Unlock-display-before-returning-alloc-error-in-XF86V.patch
new file mode 100644
index 00000000000..3be28ee5b82
--- /dev/null
+++ b/main/libxxf86vm/0004-Unlock-display-before-returning-alloc-error-in-XF86V.patch
@@ -0,0 +1,28 @@
+From 6c82906f25abcb0f8ec92bcdaf1872bd8b63ca5d Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 13 Apr 2013 17:54:45 -0700
+Subject: [PATCH 4/8] Unlock display before returning alloc error in
+ XF86VidModeGetAllModeLines()
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/XF86VMode.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/XF86VMode.c b/src/XF86VMode.c
+index 28c79c1..76276b6 100644
+--- a/src/XF86VMode.c
++++ b/src/XF86VMode.c
+@@ -322,6 +322,8 @@ XF86VidModeGetAllModeLines(Display* dpy, int screen, int* modecount,
+             _XEatData(dpy, (rep.modecount) * sizeof(xXF86OldVidModeModeInfo));
+ 	else
+             _XEatData(dpy, (rep.modecount) * sizeof(xXF86VidModeModeInfo));
++	UnlockDisplay(dpy);
++	SyncHandle();
+         return False;
+     }
+     mdinfptr = (XF86VidModeModeInfo *) (
+-- 
+1.8.2.3
+