X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=box%2Fbox.c;h=7fe08a7398d652ecde081561d78d82b1de06dddc;hb=9fcd780fa33e62f56e9449837fdcbbb223e28d6c;hp=fb623763141233a5e7668d2e6b5c81ae579d745d;hpb=bf755d50d117057d2be1197341e1d91bc5f1a808;p=moe.git

diff --git a/box/box.c b/box/box.c
index fb62376..7fe08a7 100644
--- a/box/box.c
+++ b/box/box.c
@@ -7,6 +7,8 @@
 #define _LARGEFILE64_SOURCE
 #define _GNU_SOURCE
 
+#include "autoconf.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -290,7 +292,9 @@ static unsigned char syscall_action[NUM_ACTIONS] = {
     S(get_thread_area) = A_YES,
     S(set_tid_address) = A_YES,
     S(exit_group) = A_YES | A_SAMPLE_MEM,
-#ifndef CONFIG_BOX_USER_AMD64
+#ifdef CONFIG_BOX_USER_AMD64
+    S(arch_prctl) = A_YES,
+#else
     S(oldfstat) = A_YES,
     S(ftruncate64) = A_YES,
     S(_llseek) = A_YES,
@@ -421,6 +425,7 @@ static struct path_rule default_path_rules[] = {
   { "/proc/meminfo", A_YES },
   { "/proc/self/stat", A_YES },
   { "/proc/self/exe", A_YES },			// Needed by FPC 2.0.x runtime
+  { "/proc/self/maps", A_YES },			// Needed by glibc when it reports arena corruption
 };
 
 static struct path_rule *user_path_rules;
@@ -618,21 +623,30 @@ struct syscall_args {
   struct user user;
 };
 
+static int user_mem_fd;
+
 static int read_user_mem(arg_t addr, char *buf, int len)
 {
-  static int mem_fd;
-
-  if (!mem_fd)
+  if (!user_mem_fd)
     {
       char memname[64];
       sprintf(memname, "/proc/%d/mem", (int) box_pid);
-      mem_fd = open(memname, O_RDONLY);
-      if (mem_fd < 0)
+      user_mem_fd = open(memname, O_RDONLY);
+      if (user_mem_fd < 0)
 	die("open(%s): %m", memname);
     }
-  if (lseek64(mem_fd, addr, SEEK_SET) < 0)
+  if (lseek64(user_mem_fd, addr, SEEK_SET) < 0)
     die("lseek64(mem): %m");
-  return read(mem_fd, buf, len);
+  return read(user_mem_fd, buf, len);
+}
+
+static void close_user_mem(void)
+{
+  if (user_mem_fd)
+    {
+      close(user_mem_fd);
+      user_mem_fd = 0;
+    }
 }
 
 #ifdef CONFIG_BOX_KERNEL_AMD64
@@ -1104,7 +1118,10 @@ boxkeeper(void)
 		    {
 		      msg("[master] ");
 		      if (sys == NATIVE_NR_execve)
-			exec_seen = 1;
+			{
+			  exec_seen = 1;
+			  close_user_mem();
+			}
 		    }
 		  else if ((act = valid_syscall(&a)) >= 0)
 		    {