Commit c9c9fee8 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Willy Tarreau

mm: Hold a file reference in madvise_remove

commit 9ab4233d upstream.

Otherwise the code races with munmap (causing a use-after-free
of the vma) or with close (causing a use-after-free of the struct
file).

The bug was introduced by commit 90ed52eb ("[PATCH] holepunch: fix
mmap_sem i_mutex deadlock")

[bwh: Backported to 3.2:
 - Adjust context
 - madvise_remove() calls vmtruncate_range(), not do_fallocate()]
[luto: Backported to 3.0: Adjust context]

Cc: Hugh Dickins <hugh@veritas.com>
Cc: Miklos Szeredi <mszeredi@suse.cz>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Nick Piggin <npiggin@suse.de>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent 1d568736
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/hugetlb.h> #include <linux/hugetlb.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/ksm.h> #include <linux/ksm.h>
#include <linux/file.h>
/* /*
* Any behaviour which results in changes to the vma->vm_flags needs to * Any behaviour which results in changes to the vma->vm_flags needs to
...@@ -190,14 +191,16 @@ static long madvise_remove(struct vm_area_struct *vma, ...@@ -190,14 +191,16 @@ static long madvise_remove(struct vm_area_struct *vma,
struct address_space *mapping; struct address_space *mapping;
loff_t offset, endoff; loff_t offset, endoff;
int error; int error;
struct file *f;
*prev = NULL; /* tell sys_madvise we drop mmap_sem */ *prev = NULL; /* tell sys_madvise we drop mmap_sem */
if (vma->vm_flags & (VM_LOCKED|VM_NONLINEAR|VM_HUGETLB)) if (vma->vm_flags & (VM_LOCKED|VM_NONLINEAR|VM_HUGETLB))
return -EINVAL; return -EINVAL;
if (!vma->vm_file || !vma->vm_file->f_mapping f = vma->vm_file;
|| !vma->vm_file->f_mapping->host) {
if (!f || !f->f_mapping || !f->f_mapping->host) {
return -EINVAL; return -EINVAL;
} }
...@@ -211,9 +214,16 @@ static long madvise_remove(struct vm_area_struct *vma, ...@@ -211,9 +214,16 @@ static long madvise_remove(struct vm_area_struct *vma,
endoff = (loff_t)(end - vma->vm_start - 1) endoff = (loff_t)(end - vma->vm_start - 1)
+ ((loff_t)vma->vm_pgoff << PAGE_SHIFT); + ((loff_t)vma->vm_pgoff << PAGE_SHIFT);
/* vmtruncate_range needs to take i_mutex and i_alloc_sem */ /*
* vmtruncate_range may need to take i_mutex and i_alloc_sem.
* We need to explicitly grab a reference because the vma (and
* hence the vma's reference to the file) can go away as soon as
* we drop mmap_sem.
*/
get_file(f);
up_read(&current->mm->mmap_sem); up_read(&current->mm->mmap_sem);
error = vmtruncate_range(mapping->host, offset, endoff); error = vmtruncate_range(mapping->host, offset, endoff);
fput(f);
down_read(&current->mm->mmap_sem); down_read(&current->mm->mmap_sem);
return error; return error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment