From 163b6a52a4dd44c48c40a609aa8b8b1ffc46881e Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 22 Aug 2013 20:42:58 +0100
Subject: overlay: Close DRI2 device after authentication failure

So that we don't leave a master fd open when operating remotely.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 overlay/x11/dri2.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'overlay/x11')

diff --git a/overlay/x11/dri2.c b/overlay/x11/dri2.c
index 0aa0cf53..6c9e90d6 100644
--- a/overlay/x11/dri2.c
+++ b/overlay/x11/dri2.c
@@ -39,6 +39,7 @@
 #include <xf86drm.h>
 #include <drm.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 #include "dri2.h"
 
@@ -160,10 +161,14 @@ int dri2_open(Display *dpy)
 		return -1;
 
 	if (drmIoctl(fd, DRM_IOCTL_GET_MAGIC, &auth))
-		return -1;
+		goto err_fd;
 
 	if (!DRI2Authenticate(dpy, DefaultRootWindow(dpy), auth.magic))
-		return -1;
+		goto err_fd;
 
 	return fd;
+
+err_fd:
+	close(fd);
+	return -1;
 }
-- 
cgit v1.2.3