[2/7] parasite: Simplify get_vma_by_ip()

Submitted by Pavel Emelianov on Sept. 26, 2016, 10:19 a.m.

Details

Message ID 57E8F64B.3030203@virtuozzo.com
State Accepted
Series "Prepare parasite_infect_seized() for compel-ization"
Commit 93b72db03f2c5d3f22bb4fa50c6ecb39f2436f2d
Headers show

Commit Message

Pavel Emelianov Sept. 26, 2016, 10:19 a.m.
We only really need this call to find where we can dive
into the victim to make a single (!) syscall. So no need
in such a complication, just have get_exec_start() call
that finds such vaddr.

Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 criu/parasite-syscall.c | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

Patch hide | download patch | download mbox

diff --git a/criu/parasite-syscall.c b/criu/parasite-syscall.c
index 46b70d8..facb25c 100644
--- a/criu/parasite-syscall.c
+++ b/criu/parasite-syscall.c
@@ -44,36 +44,28 @@ 
 #define MEMFD_FNAME	"CRIUMFD"
 #define MEMFD_FNAME_SZ	sizeof(MEMFD_FNAME)
 
-static int can_run_syscall(unsigned long ip, unsigned long start,
-			   unsigned long end, unsigned long pad)
-{
-	return ip >= start && ip < (end - BUILTIN_SYSCALL_SIZE - pad);
-}
-
-static int syscall_fits_vma_area(struct vma_area *vma_area, unsigned long pad)
-{
-	return can_run_syscall((unsigned long)vma_area->e->start,
-			       (unsigned long)vma_area->e->start,
-			       (unsigned long)vma_area->e->end,
-			       pad);
-}
-
-static struct vma_area *get_vma_by_ip(struct list_head *vma_area_list,
-				      unsigned long ip,
-				      unsigned long pad)
+static unsigned long get_exec_start(struct list_head *vma_area_list)
 {
 	struct vma_area *vma_area;
 
 	list_for_each_entry(vma_area, vma_area_list, list) {
+		unsigned long len;
+
 		if (vma_area->e->start >= kdat.task_size)
 			continue;
 		if (!(vma_area->e->prot & PROT_EXEC))
 			continue;
-		if (syscall_fits_vma_area(vma_area, pad))
-			return vma_area;
+
+		len = vma_area_len(vma_area);
+		if (len < BUILTIN_SYSCALL_SIZE + MEMFD_FNAME_SZ) {
+			pr_warn("Suspiciously short VMA @%#lx\n", (unsigned long)vma_area->e->start);
+			continue;
+		}
+
+		return vma_area->e->start;
 	}
 
-	return NULL;
+	return 0;
 }
 
 #ifndef ARCH_HAS_GET_REGS
@@ -1250,7 +1242,6 @@  err:
 struct parasite_ctl *parasite_prep_ctl(pid_t pid, struct vm_area_list *vma_area_list)
 {
 	struct parasite_ctl *ctl = NULL;
-	struct vma_area *vma_area;
 
 	if (!arch_can_dump_task(pid))
 		goto err;
@@ -1276,15 +1267,13 @@  struct parasite_ctl *parasite_prep_ctl(pid_t pid, struct vm_area_list *vma_area_
 		return ctl;
 
 	/* Search a place for injecting syscall */
-	vma_area = get_vma_by_ip(&vma_area_list->h, REG_IP(ctl->orig.regs),
-				 MEMFD_FNAME_SZ);
-	if (!vma_area) {
+	ctl->syscall_ip = get_exec_start(&vma_area_list->h);
+	if (!ctl->syscall_ip) {
 		pr_err("No suitable VMA found to run parasite "
 		       "bootstrap code (pid: %d)\n", pid);
 		goto err;
 	}
 
-	ctl->syscall_ip	= vma_area->e->start;
 	pr_debug("Parasite syscall_ip at %p\n", (void *)ctl->syscall_ip);
 
 	return ctl;