[CRIU] error in VDSO remap

[Cyrill Gorcunov]

On Thu, Jun 04, 2015 at 08:08:17AM -0600, Tycho Andersen wrote:
> On Thu, Jun 04, 2015 at 04:54:53PM +0300, Cyrill Gorcunov wrote:
> > On Thu, Jun 04, 2015 at 04:02:57PM +0300, Pavel Emelyanov wrote:
> > > 
> > > Cyrill, can you help us please :)
> > 
> > Tycho, could you please give me all images criu generated (together withdump log).
> > Say make a tarball, I need to look intp image data.
> 
> Sure,
> 
> http://files.tycho.ws/tmp/vdso-crash.tar.gz

Could you please give the patch a shot?
---
diff --git a/cr-restore.c b/cr-restore.c
index 68bc0b2940fe..83150a2d9974 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -270,6 +270,12 @@ static int map_private_vma(pid_t pid, struct vma_area *vma, void **tgt_addr,
 		if (!vma_area_is_private(p))
 			continue;
 
+#ifdef CONFIG_VDSO
+		if (vma_entry_is(p->e, VMA_AREA_VDSO) ||
+		    vma_entry_is(p->e, VMA_AREA_VVAR))
+			continue;
+#endif
+
 		 if (p->e->end != vma->e->end ||
 		     p->e->start != vma->e->start)
 			continue;