summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2009-09-15 19:41:04 -0400
committerEamon Walsh <ewalsh@tycho.nsa.gov>2009-10-01 11:06:50 -0700
commit9e602a61597c50267846c074460de60d7c79005f (patch)
tree5bb9b3a91d6d829e1576984effbc9fa8257ad866
parent51cf9f13b3be31a75da272da6dbabc3c6097d3cb (diff)
xselinux: Stop special-casing QueryPointer access checks.
XACE has been changed to not return BadAccess on device read failures. Thus, no need for this workaround code. Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
-rw-r--r--Xext/xselinux_hooks.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index a27067319..fe534880b 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -372,17 +372,6 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
}
}
- /* XXX only check read permission on XQueryKeymap */
- /* This is to allow the numerous apps that call XQueryPointer to work */
- if (rec->access_mode & DixReadAccess) {
- ClientPtr client = rec->client;
- REQUEST(xReq);
- if (stuff && stuff->reqType != X_QueryKeymap) {
- rec->access_mode &= ~DixReadAccess;
- rec->access_mode |= DixGetAttrAccess;
- }
- }
-
rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DEVICE, rec->access_mode,
&auditdata);
if (rc != Success)