diff options
| author | Hugh Dickins <hugh@veritas.com> | 2009-02-08 20:56:58 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-12 09:50:36 -0800 |
| commit | 7bf97ba5bb635e84e2092d4de4092dcf76ad82a0 (patch) | |
| tree | d662cd451f2d364c98c31c80f11c6536a0a36d90 /mm | |
| parent | 82bb8f277d0a486ab49559401227dd2755d7df0f (diff) | |
mm: fix error case in mlock downgrade reversion
commit d5b562330ec766292a3ac54ae5e0673610bd5b3d upstream.
Commit 27421e211a39784694b597dbf35848b88363c248, Manually revert
"mlock: downgrade mmap sem while populating mlocked regions", has
introduced its own regression: __mlock_vma_pages_range() may report
an error (for example, -EFAULT from trying to lock down pages from
beyond EOF), but mlock_vma_pages_range() must hide that from its
callers as before.
Reported-by: Sami Farin <safari-kernel@safari.iki.fi>
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mlock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index 13e0f9af3bd..64dca47c5cb 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -310,7 +310,10 @@ long mlock_vma_pages_range(struct vm_area_struct *vma, is_vm_hugetlb_page(vma) || vma == get_gate_vma(current))) { - return __mlock_vma_pages_range(vma, start, end, 1); + __mlock_vma_pages_range(vma, start, end, 1); + + /* Hide errors from mmap() and other callers */ + return 0; } /* |