Reverting the previous via security-fix commit, since the assumption of

    contexts registered with the callers filp was wrong.

4 files changed, 2 insertions, 43 deletions

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 8fed5e729..2b4dbcf67 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -838,7 +838,6 @@ extern int drm_context_switch_complete(drm_device_t * dev, int new);
 extern int drm_ctxbitmap_init(drm_device_t * dev);
 extern void drm_ctxbitmap_cleanup(drm_device_t * dev);
 extern void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle);
-extern int drm_check_context(drm_file_t *priv, drm_context_t handle);
 
 extern int drm_setsareactx(struct inode *inode, struct file *filp,
 			   unsigned int cmd, unsigned long arg);
diff --git a/linux-core/drm_context.c b/linux-core/drm_context.c
index ce4b06efb..baa8437d0 100644
--- a/linux-core/drm_context.c
+++ b/linux-core/drm_context.c
@@ -576,34 +576,4 @@ int drm_rmctx(struct inode *inode, struct file *filp,
 	return 0;
 }
 
-/**
- * Check that a context is registered for a caller.
- *
- * \param priv file pointer private structure.
- * \param handle context handle.
- * \param arg user argument pointing to a drm_ctx structure.
- * \return one if the context is registered with the file pointer. Zero otherwise.
- */
-
-int drm_check_context(drm_file_t *priv, drm_context_t handle)
-{
-	drm_device_t *dev = priv->head->dev;
-	int ret = 0;
-
-	down(&dev->ctxlist_sem);
-	if (dev->ctxlist && !list_empty(&dev->ctxlist->head)) {
-		drm_ctx_list_t *pos, *n;
-
-		list_for_each_entry_safe(pos, n, &dev->ctxlist->head, head) {
-			if (pos->handle == handle) {
-				ret = (pos->tag == priv);
-				break;
-			}
-		}
-	}
-	up(&dev->ctxlist_sem);
-	return ret;
-}
-	
-EXPORT_SYMBOL(drm_check_context);
 /*@}*/
diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h
index 95af8b9cf..a059261dc 100644
--- a/shared-core/via_drv.h
+++ b/shared-core/via_drv.h
@@ -28,11 +28,11 @@
 
 #define DRIVER_NAME		"via"
 #define DRIVER_DESC		"VIA Unichrome / Pro"
-#define DRIVER_DATE		"20050810"
+#define DRIVER_DATE		"20050812"
 
 #define DRIVER_MAJOR		2
 #define DRIVER_MINOR		6
-#define DRIVER_PATCHLEVEL	5
+#define DRIVER_PATCHLEVEL	6
 
 #include "via_verifier.h"
 
diff --git a/shared-core/via_mm.c b/shared-core/via_mm.c
index 89d762f1c..13921f3c0 100644
--- a/shared-core/via_mm.c
+++ b/shared-core/via_mm.c
@@ -192,16 +192,11 @@ int via_final_context(struct drm_device *dev, int context)
 
 int via_mem_alloc(DRM_IOCTL_ARGS)
 {
-	drm_file_t *priv = filp->private_data;
 	drm_via_mem_t mem;
 
 	DRM_COPY_FROM_USER_IOCTL(mem, (drm_via_mem_t __user *) data,
 				 sizeof(mem));
 
-	if (!drm_check_context(priv, mem.context)) {
-		return DRM_ERR(EINVAL);
-	}
-
 	switch (mem.type) {
 	case VIDEO:
 		if (via_fb_alloc(&mem) < 0)
@@ -294,16 +289,11 @@ static int via_agp_alloc(drm_via_mem_t * mem)
 
 int via_mem_free(DRM_IOCTL_ARGS)
 {
-	drm_file_t *priv = filp->private_data;
 	drm_via_mem_t mem;
 
 	DRM_COPY_FROM_USER_IOCTL(mem, (drm_via_mem_t __user *) data,
 				 sizeof(mem));
 
-	if (!drm_check_context(priv, mem.context)) {
-		return DRM_ERR(EINVAL);
-	}
-
 	switch (mem.type) {
 
 	case VIDEO: