devel/xorg-x11-server xserver-1.4.99-selinux-fix.patch, NONE, 1.1 xorg-x11-server.spec, 1.298, 1.299

Jeremy Katz (katzj) fedora-extras-commits at redhat.com
Thu Feb 28 21:54:06 UTC 2008


Author: katzj

Update of /cvs/pkgs/devel/xorg-x11-server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7508

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.4.99-selinux-fix.patch 
Log Message:
* Thu Feb 28 2008 Jeremy Katz <katzj at redhat.com> - 1.4.99.1-0.26
- Pull in another SELinux fix from upstream


xserver-1.4.99-selinux-fix.patch:

--- NEW FILE xserver-1.4.99-selinux-fix.patch ---
From: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Thu, 28 Feb 2008 03:29:15 +0000 (-0500)
Subject: xselinux: Don't throw BadAccess if DixUnknownAccess is passed in to a hook.
X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=e40cc5305bec656108077ab13fcc8e6e82b3707a

xselinux: Don't throw BadAccess if DixUnknownAccess is passed in to a hook.

The avc will still appear, however, so that the callsite can be fixed.
---

--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -312,6 +312,8 @@ SELinuxDoCheck(SELinuxSubjectRec *subj, 
 
     if (avc_has_perm(subj->sid, obj->sid, class, mode, &subj->aeref,
 		     auditdata) < 0) {
+	if (mode == DixUnknownAccess)
+	    return Success; /* DixUnknownAccess requests OK ... for now */
 	if (errno == EACCES)
 	    return BadAccess;
 	ErrorF("ServerPerm: unexpected error %d\n", errno);


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/devel/xorg-x11-server/xorg-x11-server.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- xorg-x11-server.spec	27 Feb 2008 17:02:34 -0000	1.298
+++ xorg-x11-server.spec	28 Feb 2008 21:53:32 -0000	1.299
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.1
-Release:   0.25.%{?gitdate}%{?dist}
+Release:   0.26.%{?gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -36,6 +36,7 @@
 Source0:   ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
 %endif
 
+Patch10:   xserver-1.4.99-selinux-fix.patch
 # general bug fixes
 Patch19:   xserver-1.3.0-xnest-exposures.patch
 
@@ -509,6 +510,9 @@
 
 
 %changelog
+* Thu Feb 28 2008 Jeremy Katz <katzj at redhat.com> - 1.4.99.1-0.26
+- Pull in another SELinux fix from upstream
+
 * Wed Feb 27 2008 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.25
 - Today's git snapshot.  Selinux fixes, XKB crash fix.
 




More information about the fedora-extras-commits mailing list