summaryrefslogtreecommitdiff
authorEamon Walsh <ewalsh@tycho.nsa.gov>2009-09-15 23:41:04 (GMT)
committer Eamon Walsh <ewalsh@tycho.nsa.gov>2009-10-15 00:58:34 (GMT)
commit4a8cc895ccdb64945661747c75a118deea96b53a (patch) (side-by-side diff)
tree91e7a76513ad6438611b7c34dfb79911313ee6e7
parent2180174034ae007023f248964be315fccc3c32ee (diff)
downloadxserver-4a8cc895ccdb64945661747c75a118deea96b53a.zip
xserver-4a8cc895ccdb64945661747c75a118deea96b53a.tar.gz
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. [Backport to 1.6] Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Xext/xselinux.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 3124eb9..238bdb5 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -714,17 +714,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)