From cdf49e57329803709fe26cbc103c318bc9292ddb Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Fri, 12 Aug 2005 14:19:33 +0000 Subject: Reverting the previous via security-fix commit, since the assumption of contexts registered with the callers filp was wrong. --- shared-core/via_drv.h | 4 ++-- shared-core/via_mm.c | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) (limited to 'shared-core') diff --git a/shared-core/via_drv.h b/shared-core/via_drv.h index 95af8b9c..a059261d 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 89d762f1..13921f3c 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: -- cgit v1.2.3