From 73975ef3a39ce522c6206ca800ed175fbf851dcf Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Mon, 10 Aug 2009 18:34:07 -0400 Subject: [PATCH] xselinux: Allow per-client device create contexts. The previous behavior was to set the serverClient's value which was used globally. This is in support of XI2, where clients can create device pairs directly. Signed-off-by: Eamon Walsh --- Xext/xselinux.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Xext/xselinux.c b/Xext/xselinux.c index d71895174..a199a0e46 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c @@ -1318,14 +1318,6 @@ ProcSELinuxSetCreateContext(ClientPtr client, unsigned offset) return BadAlloc; } - if (offset == CTX_DEV) { - /* Device create context currently requires manage permission */ - rc = XaceHook(XACE_SERVER_ACCESS, client, DixManageAccess); - if (rc != Success) - goto out; - privPtr = &serverClient->devPrivates; - } - ptr = dixLookupPrivate(privPtr, subjectKey); pSid = (security_id_t *)(ptr + offset); sidput(*pSid); @@ -1337,7 +1329,7 @@ ProcSELinuxSetCreateContext(ClientPtr client, unsigned offset) avc_context_to_sid_raw(ctx, pSid) < 0) rc = BadValue; } -out: + xfree(ctx); return rc; }