summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorNadav Amit <namit@vmware.com>2018-09-05 00:45:41 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-09-05 01:45:02 +0200
commit1ed0cc5a01a4d868d9907ce96468c4b4c6709556 (patch)
tree31397f1855959637bd99d734743081ce13e6d1ea /kernel
parentmm, oom: fix missing tlb_finish_mmu() in __oom_reap_task_mm(). (diff)
downloadlinux-1ed0cc5a01a4d868d9907ce96468c4b4c6709556.tar.xz
linux-1ed0cc5a01a4d868d9907ce96468c4b4c6709556.zip
mm: respect arch_dup_mmap() return value
Commit d70f2a14b72a ("include/linux/sched/mm.h: uninline mmdrop_async(), etc") ignored the return value of arch_dup_mmap(). As a result, on x86, a failure to duplicate the LDT (e.g. due to memory allocation error) would leave the duplicated memory mapping in an inconsistent state. Fix by using the return value, as it was before the change. Link: http://lkml.kernel.org/r/20180823051229.211856-1-namit@vmware.com Fixes: d70f2a14b72a4 ("include/linux/sched/mm.h: uninline mmdrop_async(), etc") Signed-off-by: Nadav Amit <namit@vmware.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fork.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index d896e9ca38b0..f0b58479534f 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -550,8 +550,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
goto out;
}
/* a new mm has just been created */
- arch_dup_mmap(oldmm, mm);
- retval = 0;
+ retval = arch_dup_mmap(oldmm, mm);
out:
up_write(&mm->mmap_sem);
flush_tlb_mm(oldmm);