diff options
author | Nick Piggin <npiggin@suse.de> | 2008-02-01 21:08:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:55:38 -0500 |
commit | 2f98735c9c24ea1f0d40a364d4e63611b689b795 (patch) | |
tree | a42b3802449af474d36cda3b6f9fb190a717defb /sound/usb/usx2y | |
parent | fe2528b96b02173395f5a75e37714c07f3e25e73 (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 'sound/usb/usx2y')
-rw-r--r-- | sound/usb/usx2y/usX2Yhwdep.c | 2 | ||||
-rw-r--r-- | sound/usb/usx2y/usx2yhwdeppcm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c index 6495534e5bf6..1558a5c4094f 100644 --- a/sound/usb/usx2y/usX2Yhwdep.c +++ b/sound/usb/usx2y/usX2Yhwdep.c | |||
@@ -84,7 +84,7 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v | |||
84 | us428->us428ctls_sharedmem->CtlSnapShotLast = -2; | 84 | us428->us428ctls_sharedmem->CtlSnapShotLast = -2; |
85 | } | 85 | } |
86 | area->vm_ops = &us428ctls_vm_ops; | 86 | area->vm_ops = &us428ctls_vm_ops; |
87 | area->vm_flags |= VM_RESERVED; | 87 | area->vm_flags |= VM_RESERVED | VM_DONTEXPAND; |
88 | area->vm_private_data = hw->private_data; | 88 | area->vm_private_data = hw->private_data; |
89 | return 0; | 89 | return 0; |
90 | } | 90 | } |
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index 800b5cecfc80..117946f2debb 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.c +++ b/sound/usb/usx2y/usx2yhwdeppcm.c | |||
@@ -722,7 +722,7 @@ static int snd_usX2Y_hwdep_pcm_mmap(struct snd_hwdep * hw, struct file *filp, st | |||
722 | return -ENODEV; | 722 | return -ENODEV; |
723 | } | 723 | } |
724 | area->vm_ops = &snd_usX2Y_hwdep_pcm_vm_ops; | 724 | area->vm_ops = &snd_usX2Y_hwdep_pcm_vm_ops; |
725 | area->vm_flags |= VM_RESERVED; | 725 | area->vm_flags |= VM_RESERVED | VM_DONTEXPAND; |
726 | area->vm_private_data = hw->private_data; | 726 | area->vm_private_data = hw->private_data; |
727 | return 0; | 727 | return 0; |
728 | } | 728 | } |