From: Greg Kroah-Hartman Date: Sun, 8 Feb 2009 22:15:09 +0000 (-0800) Subject: another .28 patch X-Git-Tag: v2.6.27.16~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7df86e3b8027883e2c35c6fa3a1e0f9f8f7d02e5;p=thirdparty%2Fkernel%2Fstable-queue.git another .28 patch --- diff --git a/queue-2.6.28/mm-fix-error-case-in-mlock-downgrade-reversion.patch b/queue-2.6.28/mm-fix-error-case-in-mlock-downgrade-reversion.patch new file mode 100644 index 00000000000..aa2802d166d --- /dev/null +++ b/queue-2.6.28/mm-fix-error-case-in-mlock-downgrade-reversion.patch @@ -0,0 +1,38 @@ +From d5b562330ec766292a3ac54ae5e0673610bd5b3d Mon Sep 17 00:00:00 2001 +From: Hugh Dickins +Date: Sun, 8 Feb 2009 20:56:58 +0000 +Subject: mm: fix error case in mlock downgrade reversion + +From: Hugh Dickins + +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 +Signed-off-by: Hugh Dickins +Signed-off-by: Linus Torvalds + +--- + mm/mlock.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/mm/mlock.c ++++ b/mm/mlock.c +@@ -310,7 +310,10 @@ long mlock_vma_pages_range(struct vm_are + 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; + } + + /* diff --git a/queue-2.6.28/series b/queue-2.6.28/series index e6c307c1815..81c48cd57c9 100644 --- a/queue-2.6.28/series +++ b/queue-2.6.28/series @@ -39,3 +39,4 @@ seq_file-move-traverse-so-it-can-be-used-from-seq_read.patch seq_file-fix-big-enough-lseek-read.patch serial-set-correct-baud_base-for-oxford-semiconductor-ltd-exsys-ex-41092-dual-16950-serial-adapter.patch add-support-for-8-port-rs-232-mic-3620-from-advantech.patch +mm-fix-error-case-in-mlock-downgrade-reversion.patch