aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2008-02-01 21:08:53 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 10:55:38 -0500
commit2f98735c9c24ea1f0d40a364d4e63611b689b795 (patch)
treea42b3802449af474d36cda3b6f9fb190a717defb /drivers/char/drm
parentfe2528b96b02173395f5a75e37714c07f3e25e73 (diff)
vm audit: add VM_DONTEXPAND to mmap for drivers that need it
Drivers that register a ->fault handler, but do not range-check the offset argument, must set VM_DONTEXPAND in the vm_flags in order to prevent an expanding mremap from overflowing the resource. I've audited the tree and attempted to fix these problems (usually by adding VM_DONTEXPAND where it is not obvious). Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/drm')
-rw-r--r--drivers/char/drm/drm_vm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index e8d50af58201..ef5e6b130c48 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -506,6 +506,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
506 vma->vm_ops = &drm_vm_dma_ops; 506 vma->vm_ops = &drm_vm_dma_ops;
507 507
508 vma->vm_flags |= VM_RESERVED; /* Don't swap */ 508 vma->vm_flags |= VM_RESERVED; /* Don't swap */
509 vma->vm_flags |= VM_DONTEXPAND;
509 510
510 vma->vm_file = filp; /* Needed for drm_vm_open() */ 511 vma->vm_file = filp; /* Needed for drm_vm_open() */
511 drm_vm_open_locked(vma); 512 drm_vm_open_locked(vma);
@@ -655,6 +656,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
655 return -EINVAL; /* This should never happen. */ 656 return -EINVAL; /* This should never happen. */
656 } 657 }
657 vma->vm_flags |= VM_RESERVED; /* Don't swap */ 658 vma->vm_flags |= VM_RESERVED; /* Don't swap */
659 vma->vm_flags |= VM_DONTEXPAND;
658 660
659 vma->vm_file = filp; /* Needed for drm_vm_open() */ 661 vma->vm_file = filp; /* Needed for drm_vm_open() */
660 drm_vm_open_locked(vma); 662 drm_vm_open_locked(vma);