Some processes (CRIU) are moving the vDSO area using the mremap system
call. As a consequence the kernel reference to the vDSO base address is
no more valid and the signal return frame built once the vDSO has been
moved is not pointing to the new sigreturn address.
This patch handles vDSO remapping and unmapping.
Moving or unmapping partially the vDSO lead to invalidate it from the
kernel point of view.
Signed-off-by: Laurent Dufour <ldufour@xxxxxxxxxxxxxxxxxx>
---
arch/powerpc/include/asm/mmu_context.h | 32 +++++++++++++++++++++++++++-
arch/powerpc/kernel/vdso.c | 39 ++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
index 73382eba02dc..67734ce8be67 100644
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@ -8,7 +8,6 @@
#include <linux/spinlock.h>
#include <asm/mmu.h>
#include <asm/cputable.h>
-#include <asm-generic/mm_hooks.h>
#include <asm/cputhreads.h>
/*
@@ -109,5 +108,36 @@ static inline void enter_lazy_tlb(struct mm_struct *mm,
#endif
}
+static inline void arch_dup_mmap(struct mm_struct *oldmm,
+ struct mm_struct *mm)
+{
+}
+
+static inline void arch_exit_mmap(struct mm_struct *mm)
+{
+}
+
+extern void arch_vdso_remap(struct mm_struct *mm,
+ unsigned long old_start, unsigned long old_end,
+ unsigned long new_start, unsigned long new_end);
+static inline void arch_unmap(struct mm_struct *mm, struct vm_area_struct *vma,
+ unsigned long start, unsigned long end)
+{
+ arch_vdso_remap(mm, start, end, 0, 0);
+}
+
+static inline void arch_bprm_mm_init(struct mm_struct *mm,
+ struct vm_area_struct *vma)
+{
+}
+
+#define __HAVE_ARCH_REMAP
+static inline void arch_remap(struct mm_struct *mm,
+ unsigned long old_start, unsigned long old_end,
+ unsigned long new_start, unsigned long new_end)
+{
+ arch_vdso_remap(mm, old_start, old_end, new_start, new_end);
+}
+
#endif /* __KERNEL__ */
#endif /* __ASM_POWERPC_MMU_CONTEXT_H */
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 305eb0d9b768..a11b5d8f36d6 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -283,6 +283,45 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
return rc;
}
+void arch_vdso_remap(struct mm_struct *mm,
+ unsigned long old_start, unsigned long old_end,
+ unsigned long new_start, unsigned long new_end)
+{
+ unsigned long vdso_end, vdso_start;
+
+ if (!mm->context.vdso_base)
+ return;
+ vdso_start = mm->context.vdso_base;
+
+#ifdef CONFIG_PPC64
+ /* Calling is_32bit_task() implies that we are dealing with the
+ * current process memory. If there is a call path where mm is not
+ * owned by the current task, then we'll have need to store the
+ * vDSO size in the mm->context.
+ */
+ BUG_ON(current->mm != mm);
+ if (is_32bit_task())
+ vdso_end = vdso_start + (vdso32_pages << PAGE_SHIFT);
+ else
+ vdso_end = vdso_start + (vdso64_pages << PAGE_SHIFT);
+#else
+ vdso_end = vdso_start + (vdso32_pages << PAGE_SHIFT);
+#endif
+ vdso_end += (1<<PAGE_SHIFT); /* data page */
+
+ /* Check if the vDSO is in the range of the remapped area */
+ if ((vdso_start <= old_start && old_start < vdso_end) ||
+ (vdso_start < old_end && old_end <= vdso_end) ||
+ (old_start <= vdso_start && vdso_start < old_end)) {
+ /* Update vdso_base if the vDSO is entirely moved. */
+ if (old_start == vdso_start && old_end == vdso_end &&
+ (old_end - old_start) == (new_end - new_start))
+ mm->context.vdso_base = new_start;
+ else
+ mm->context.vdso_base = 0;
+ }
+}
+
const char *arch_vma_name(struct vm_area_struct *vma)
{
if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso_base)
--
1.9.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>