rpms/kernel/F-9 linux-2.6-drm-i915-fix-ioctl-security.patch, NONE, 1.1 kernel.spec, 1.804, 1.805

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21196

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-drm-i915-fix-ioctl-security.patch 
Log Message:
DRM: fix ioctl security issue (CVE-2008-3831).

linux-2.6-drm-i915-fix-ioctl-security.patch:

--- NEW FILE linux-2.6-drm-i915-fix-ioctl-security.patch ---
Index: linux-2.6.26.noarch/drivers/char/drm/i915_dma.c
===================================================================
--- linux-2.6.26.noarch.orig/drivers/char/drm/i915_dma.c
+++ linux-2.6.26.noarch/drivers/char/drm/i915_dma.c
@@ -1577,7 +1577,7 @@ struct drm_ioctl_desc i915_ioctls[] = {
 	DRM_IOCTL_DEF(DRM_I915_GET_VBLANK_PIPE,  i915_vblank_pipe_get, DRM_AUTH ),
 	DRM_IOCTL_DEF(DRM_I915_VBLANK_SWAP, i915_vblank_swap, DRM_AUTH),
 	DRM_IOCTL_DEF(DRM_I915_MMIO, i915_mmio, DRM_AUTH),
-	DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH),
+	DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 	DRM_IOCTL_DEF(DRM_I915_EXECBUFFER, i915_execbuffer, DRM_AUTH),
 };
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.804
retrieving revision 1.805
diff -u -r1.804 -r1.805
--- kernel.spec	16 Oct 2008 17:55:58 -0000	1.804
+++ kernel.spec	17 Oct 2008 17:50:02 -0000	1.805
@@ -697,6 +697,7 @@
 
 # nouveau + drm fixes
 Patch1801: drm-fedora9-rollup.patch
+Patch1802: linux-2.6-drm-i915-fix-ioctl-security.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1324,6 +1325,7 @@
 
 # Nouveau DRM + drm fixes
 ApplyPatch drm-fedora9-rollup.patch
+ApplyPatch linux-2.6-drm-i915-fix-ioctl-security.patch
 
 # ext4dev stable patch queue, slated for 2.6.25
 #ApplyPatch linux-2.6-ext4-stable-queue.patch
@@ -1948,6 +1950,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Oct 17 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.6-78
+- DRM: fix ioctl security issue (CVE-2008-3831).
+
 * Thu Oct 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.6-77
 - Fix RTC on systems that don't describe it in PnP (#451188)