diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2009-09-15 19:41:04 -0400 |
---|---|---|
committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2009-10-14 20:58:34 -0400 |
commit | 4a8cc895ccdb64945661747c75a118deea96b53a (patch) | |
tree | 91e7a76513ad6438611b7c34dfb79911313ee6e7 | |
parent | 2180174034ae007023f248964be315fccc3c32ee (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.
[Backport to 1.6]
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
-rw-r--r-- | Xext/xselinux.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/Xext/xselinux.c b/Xext/xselinux.c index 3124eb9b7..238bdb5d5 100644 --- a/Xext/xselinux.c +++ b/Xext/xselinux.c | |||
@@ -714,17 +714,6 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata) | |||
714 | } | 714 | } |
715 | } | 715 | } |
716 | 716 | ||
717 | /* XXX only check read permission on XQueryKeymap */ | ||
718 | /* This is to allow the numerous apps that call XQueryPointer to work */ | ||
719 | if (rec->access_mode & DixReadAccess) { | ||
720 | ClientPtr client = rec->client; | ||
721 | REQUEST(xReq); | ||
722 | if (stuff && stuff->reqType != X_QueryKeymap) { | ||
723 | rec->access_mode &= ~DixReadAccess; | ||
724 | rec->access_mode |= DixGetAttrAccess; | ||
725 | } | ||
726 | } | ||
727 | |||
728 | rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DEVICE, rec->access_mode, | 717 | rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DEVICE, rec->access_mode, |
729 | &auditdata); | 718 | &auditdata); |
730 | if (rc != Success) | 719 | if (rc != Success) |