Dont allow !sysadmin clients to alter the memory type of

NO_EVICT buffers.

diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 2e21004..a94bd8a 100644 (file)
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -979,6 +979,20 @@ static int drm_bo_modify_proposed_flags (struct drm_buffer_object *bo,
                return -EPERM;
        }
 
+       if (likely(new_mask & DRM_BO_MASK_MEM) &&
+           (bo->mem.flags & DRM_BO_FLAG_NO_EVICT) &&
+           !DRM_SUSER(DRM_CURPROC)) {
+               if (likely(bo->mem.flags & new_flags & new_mask &
+                          DRM_BO_MASK_MEM))
+                       new_flags = (new_flags & ~DRM_BO_MASK_MEM) |
+                               (bo->mem.flags & DRM_BO_MASK_MEM);
+               else {
+                       DRM_ERROR("Incompatible memory type specification "
+                                 "for NO_EVICT buffer.\n");
+                       return -EPERM;
+               }
+       }
+
        if ((new_flags & DRM_BO_FLAG_NO_MOVE)) {
                DRM_ERROR("DRM_BO_FLAG_NO_MOVE is not properly implemented yet.\n");
                return -EPERM;