Changeset 2999 for neercs/trunkTweet

Timestamp:

Oct 18, 2008, 11:54:52 PM (12 years ago)

Author:

Pascal Terjan

Message:

• Run /usr/bin/reset in target process after a grab

Location:

neercs/trunk/src

Files:

• grab.c (modified) (2 diffs)
• mytrace.c (modified) (7 diffs)
• mytrace.h (modified) (2 diffs)

neercs/trunk/src/grab.c

@@ -44 +44 @@
     int mode[3];
     struct stat stat_buf;
-    struct termios tos;
 
     debug("pty is %s", ptyname);
@@ -56 +55 @@
 
     child = mytrace_fork(parent);
-    mytrace_write(parent, 1, "\x1b[H\x1b[2J", 7);
-    mytrace_write(parent, 1, "\n[Process stolen by neercs]\n", 28);
-    mytrace_tcgets(parent, 1, &tos);
-    tos.c_lflag |= ICANON|ECHO;
-    mytrace_tcsets(parent, 1, &tos);
-    mytrace_close(parent, 1);
-    mytrace_exit(parent, 0);
+    mytrace_exec(parent, "/usr/bin/reset");
+    mytrace_exit(parent, 0); /* In case the execve failed */
     mytrace_detach(parent);
+    mytrace_write(child, 1, "\x1b[H\x1b[2J", 7);
+    mytrace_write(child, 1, "\n[Process stolen by neercs]\n", 28);
     pid = mytrace_getpid(child);
 

neercs/trunk/src/mytrace.c

@@ -18 +18 @@
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -23 +24 @@
 
 #if defined USE_GRAB
-#   include <sys/ioctl.h>
 #   include <sys/ptrace.h>
 #   include <sys/stat.h>
@@ -103 +103 @@
 
 int mytrace_exit(struct mytrace *t, int status)
+{
+    errno = ENOSYS;
+    return -1;
+}
+
+int mytrace_exec(struct mytrace *t, char const *command)
 {
     errno = ENOSYS;
@@ -165 +171 @@
 #define MYCALL_FORK     7
 #define MYCALL_EXIT     8
-#define MYCALL_IOCTL    9
+#define MYCALL_EXECVE   9
 
 #if defined __x86_64__
 /* from unistd_32.h on an amd64 system */
-int syscalls32[] = { 5, 6, 4, 63, 57, 66, 37, 2, 1, 54 };
+int syscalls32[] = { 5, 6, 4, 63, 57, 66, 37, 2, 1, 11 };
 int syscalls64[] =
 #else
@@ -175 +181 @@
 #endif
     { SYS_open, SYS_close, SYS_write, SYS_dup2, SYS_setpgid, SYS_setsid,
-      SYS_kill, SYS_fork, SYS_exit, SYS_ioctl };
+      SYS_kill, SYS_fork, SYS_exit, SYS_execve };
 
 char const *syscallnames[] =
     { "open", "close", "write", "dup2", "setpgid", "setsid", "kill", "fork",
-      "exit", "ioctl" };
+      "exit", "execve" };
 
 struct mytrace
@@ -401 +407 @@
 }
 
-int mytrace_tcgets(struct mytrace *t, int fd, struct termios *tos)
+int mytrace_exec(struct mytrace *t, char const *command)
 {
 #if defined USE_GRAB
     struct user_regs_struct regs;
-    struct termios mytos;
-    int ret;
+    char *env;
+    char envpath[PATH_MAX+1];
+    ssize_t envsize = 32*1024;
+    int ret, fd, l;
+    ssize_t r;
 
     if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
@@ -414 +423 @@
     }
 
-    /* Backup the data that we will use */
-    if(memcpy_from_target(t, (char *)&mytos, regs.RSP, sizeof(struct termios)) < 0)
-        return -1;
-
-    ret = remote_syscall(t, MYCALL_IOCTL, fd, TCGETS, regs.RSP);
-
-    memcpy_from_target(t, (char *)tos, regs.RSP, sizeof(struct termios));
-
-    /* Restore the data */
-    memcpy_into_target(t, regs.RSP, (char *)&mytos, sizeof(struct termios));
-
-    if(ret < 0)
-    {
-        errno = ret;
-        return -1;
-    }
-
-    return ret;
-#else
-    errno = ENOSYS;
-    return -1;
-#endif
-}
-
-int mytrace_tcsets(struct mytrace *t, int fd, struct termios *tos)
-{
-#if defined USE_GRAB
-    struct user_regs_struct regs;
-    struct termios mytos;
-    int ret;
-
-    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
-    {
-        fprintf(stderr, "PTRACE_GETREGS failed\n");
-        return errno;
-    }
-
-    /* Backup the data that we will use */
-    if(memcpy_from_target(t, (char *)&mytos, regs.RSP, sizeof(struct termios)) < 0)
-        return -1;
-
-    memcpy_into_target(t, regs.RSP, (char *)tos, sizeof(struct termios));
-
-    ret = remote_syscall(t, MYCALL_IOCTL, fd, TCSETS, regs.RSP);
-
-    /* Restore the data */
-    memcpy_into_target(t, regs.RSP, (char *)&mytos, sizeof(struct termios));
+    env = malloc(envsize);
+    if (!env)
+        return -1;
+
+    snprintf(envpath, PATH_MAX, "/proc/%d/environ", t->pid);
+
+    fd = open(envpath, O_RDONLY);
+    r = read(fd, env, envsize);
+    close(fd);
+    if (r == -1)
+        return -1;
+    while (r == envsize)
+    {
+        free(env);
+        env = malloc(envsize);
+        if (!env)
+            return -1;
+        fd = open(envpath, O_RDONLY);
+        r = read(fd, env, envsize);
+        close(fd);
+        if (r == -1)
+            return -1;
+    }
+    l = strlen(command)+1;
+    memcpy_into_target(t, regs.RSP, command, l);
+    memcpy_into_target(t, regs.RSP+l, env, envsize);
+    free(env);
+    ret = remote_syscall(t, MYCALL_EXECVE, regs.RSP, 0, regs.RSP+l);
 
     if(ret < 0)

neercs/trunk/src/mytrace.h

@@ -12 +12 @@
  *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
-
-#include <termios.h>
 
 struct mytrace;
@@ -30 +28 @@
 int mytrace_kill(struct mytrace *t, long pid, int sig);
 int mytrace_exit(struct mytrace *t, int status);
-int mytrace_tcgets(struct mytrace *t, int fd, struct termios *tos);
-int mytrace_tcsets(struct mytrace *t, int fd, struct termios *tos);
+int mytrace_exec(struct mytrace *t, char const *command);