diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2015-05-14 01:02:16 +0000 |
|---|---|---|
| committer | Johannes Weiner <hannes@cmpxchg.org> | 2015-05-14 01:02:16 +0000 |
| commit | 9f3958327066abcc1e08e989e945b98900056cd4 (patch) | |
| tree | ccd0cd0e069a0c3ad71b7935759aaf3a6861fd3c | |
| parent | bf0acdc6ba033d0e2a6e48edab3870b4b3cfe4a5 (diff) | |
| download | mm-next-9f3958327066abcc1e08e989e945b98900056cd4.tar.gz | |
do_shared_fault(): check that mmap_sem is held
mmap_sem() is required to protect the vma, which holds ->vm_file, which
pins fault_page->mapping.
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Bob Liu <lliubbo@gmail.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/memory.c b/mm/memory.c index d1fa0c1fad0bc..be9f0757e5cf9 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3031,6 +3031,8 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma, int dirtied = 0; int ret, tmp; + WARN_ON_ONCE(!rwsem_is_locked(&mm->mmap_sem)); + ret = __do_fault(vma, address, pgoff, flags, NULL, &fault_page); if (unlikely(ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE | VM_FAULT_RETRY))) return ret; |