xserver: Branch 'server-1.5-branch'

[Eamon Walsh]

 dix/selection.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 926f32df3c8b9c9e1822d54918a4d833ee21c344
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Tue Mar 4 02:44:48 2008 -0500

    XACE: Check the return value of the selection create hook call.
    (cherry picked from commit 056a2ce02ce85013e89055ee44a7aa3eabedac09)

diff --git a/dix/selection.c b/dix/selection.c
index 11a174e..6a9198e 100644
--- a/dix/selection.c
+++ b/dix/selection.c
@@ -206,7 +206,12 @@ ProcSetSelectionOwner(ClientPtr client)
 	pSel->devPrivates = NULL;
 
 	/* security creation/labeling check */
-	(void)XaceHookSelectionAccess(client, &pSel, DixCreateAccess);
+	rc = XaceHookSelectionAccess(client, &pSel,
+				     DixCreateAccess|DixSetAttrAccess);
+	if (rc != Success) {
+	    xfree(pSel);
+	    return rc;
+	}
 
 	pSel->next = CurrentSelections;
 	CurrentSelections = pSel;