From b942999b5915cbad75f16f6c242bab03c33f0c8b Mon Sep 17 00:00:00 2001 From: Michel Daenzer Date: Sat, 17 May 2003 00:37:34 +0000 Subject: do allow reading from read only mappings... --- linux-core/drm_vm.c | 2 +- linux/drm_vm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c index 59b19da3..f9c1e356 100644 --- a/linux-core/drm_vm.c +++ b/linux-core/drm_vm.c @@ -416,7 +416,7 @@ int DRM(mmap)(struct file *filp, struct vm_area_struct *vma) if (map->size != vma->vm_end - vma->vm_start) return -EINVAL; if (!capable(CAP_SYS_ADMIN) && (map->flags & _DRM_READ_ONLY)) { - vma->vm_flags &= VM_MAYWRITE; + vma->vm_flags &= (VM_READ | VM_MAYREAD); #if defined(__i386__) || defined(__x86_64__) pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; #else diff --git a/linux/drm_vm.h b/linux/drm_vm.h index 59b19da3..f9c1e356 100644 --- a/linux/drm_vm.h +++ b/linux/drm_vm.h @@ -416,7 +416,7 @@ int DRM(mmap)(struct file *filp, struct vm_area_struct *vma) if (map->size != vma->vm_end - vma->vm_start) return -EINVAL; if (!capable(CAP_SYS_ADMIN) && (map->flags & _DRM_READ_ONLY)) { - vma->vm_flags &= VM_MAYWRITE; + vma->vm_flags &= (VM_READ | VM_MAYREAD); #if defined(__i386__) || defined(__x86_64__) pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; #else -- cgit v1.2.3