diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2009-09-15 19:41:04 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2009-10-27 14:30:06 -0700 |
commit | f9e6ee70f32b6d86fb272e2824deb7309b7ea7ce (patch) | |
tree | 91e7a76513ad6438611b7c34dfb79911313ee6e7 | |
parent | c1c7feec90be7494a23f97e5a1dda0e140abeac2 (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>
Signed-off-by: Keith Packard <keithp@keithp.com>
-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) } } - /* 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) |