MFC r1.2. Fix CVE-2008-3831. Affects the Intel G33 series and newer only.
authorHasso Tepper <hasso@dragonflybsd.org>
Mon, 27 Oct 2008 03:46:17 +0000 (27 03:46 +0000)
committerHasso Tepper <hasso@dragonflybsd.org>
Mon, 27 Oct 2008 03:46:17 +0000 (27 03:46 +0000)
Obtained-from: DRM git

sys/dev/drm/i915_dma.c

index 6e743b5..b3eabb6 100644 (file)
@@ -24,7 +24,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * $DragonFly: src/sys/dev/drm/i915_dma.c,v 1.1 2008/04/05 18:12:29 hasso Exp $
+ * $DragonFly: src/sys/dev/drm/i915_dma.c,v 1.1.2.1 2008/10/27 03:46:17 hasso Exp $
  */
 
 #include "drmP.h"
@@ -1435,7 +1435,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),
 #ifdef I915_HAVE_BUFFER
        DRM_IOCTL_DEF(DRM_I915_EXECBUFFER, i915_execbuffer, DRM_AUTH),
 #endif