Skip to content

Commit 8df6ab7

Browse files
Roman Penyaevgregkh
Roman Penyaev
authored andcommitted
mm/vmalloc: fix size check for remap_vmalloc_range_partial()
commit 401592d upstream. When VM_NO_GUARD is not set area->size includes adjacent guard page, thus for correct size checking get_vm_area_size() should be used, but not area->size. This fixes possible kernel oops when userspace tries to mmap an area on 1 page bigger than was allocated by vmalloc_user() call: the size check inside remap_vmalloc_range_partial() accounts non-existing guard page also, so check successfully passes but vmalloc_to_page() returns NULL (guard page does not physically exist). The following code pattern example should trigger an oops: static int oops_mmap(struct file *file, struct vm_area_struct *vma) { void *mem; mem = vmalloc_user(4096); BUG_ON(!mem); /* Do not care about mem leak */ return remap_vmalloc_range(vma, mem, 0); } And userspace simply mmaps size + PAGE_SIZE: mmap(NULL, 8192, PROT_WRITE|PROT_READ, MAP_PRIVATE, fd, 0); Possible candidates for oops which do not have any explicit size checks: *** drivers/media/usb/stkwebcam/stk-webcam.c: v4l_stk_mmap[789] ret = remap_vmalloc_range(vma, sbuf->buffer, 0); Or the following one: *** drivers/video/fbdev/core/fbmem.c static int fb_mmap(struct file *file, struct vm_area_struct * vma) ... res = fb->fb_mmap(info, vma); Where fb_mmap callback calls remap_vmalloc_range() directly without any explicit checks: *** drivers/video/fbdev/vfb.c static int vfb_mmap(struct fb_info *info, struct vm_area_struct *vma) { return remap_vmalloc_range(vma, (void *)info->fix.smem_start, vma->vm_pgoff); } Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Roman Penyaev <[email protected]> Acked-by: Michal Hocko <[email protected]> Cc: Andrey Ryabinin <[email protected]> Cc: Joe Perches <[email protected]> Cc: "Luis R. Rodriguez" <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 84fe804 commit 8df6ab7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/vmalloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2248,7 +2248,7 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
22482248
if (!(area->flags & VM_USERMAP))
22492249
return -EINVAL;
22502250

2251-
if (kaddr + size > area->addr + area->size)
2251+
if (kaddr + size > area->addr + get_vm_area_size(area))
22522252
return -EINVAL;
22532253

22542254
do {

0 commit comments

Comments
 (0)