Changeset 3873Tweet

Timestamp:

11/02/09 16:07:54 (4 years ago)

Author:

pterjan

Message:

• Improve consoles state after grabbing

Location:

neercs/trunk/src

Files:

• grab.c (modified) (6 diffs)
• mytrace.c (modified) (4 diffs)
• mytrace.h (modified) (2 diffs)

neercs/trunk/src/grab.c

@@ -17 +17 @@
 #define _XOPEN_SOURCE 500 /* getsid() */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -41 +42 @@
     char fdstr[1024];
     struct mytrace *parent, *child;
-    int i, fd = 0, ret;
-    char to_open[3];
-    int mode[3];
+    int i = 0, fd = 0, ret;
+    char to_open[128];
+    int mode[128];
+    int fds[128];
     struct stat stat_buf;
+    struct termios tos;
+    int validtos = 0;
+    DIR *fddir;
+    struct dirent *fddirent;
 
     debug("pty is %s", ptyname);
@@ -54 +60 @@
         return -1;
     }
-
+    
     child = mytrace_fork(parent);
-    ret = mytrace_exec(parent, "/usr/bin/reset");
-    if(ret < 0)
-        mytrace_exit(parent, 0);
-    mytrace_detach(parent);
-    waitpid(pid, NULL, 0); /* Wait for reset to finish before displaying */
-    mytrace_write(child, 1, "\x1b[H\x1b[2J", 7);
-    mytrace_write(child, 1, "\n[Process stolen by neercs]\r\n\n", 30);
-    pid = mytrace_getpid(child);
+ 
+    snprintf(fdstr, sizeof(fdstr), "/proc/%ld/fd", pid);
+    fddir = opendir(fdstr);
 
     /* Look for file descriptors that are PTYs */
-    for(i = 0; i <= 2; i++)
+    while((fddirent = readdir(fddir)) && i < (int)sizeof(to_open)-1)
     {
-        snprintf(fdstr, sizeof(fdstr), "/proc/%ld/fd/%d", pid, i);
+        fd = atoi(fddirent->d_name);
+        fds[i] = fd;
         to_open[i] = 0;
         lstat(fdstr, &stat_buf);
@@ -78 +80 @@
             mode[i] = O_RDONLY;
 
+        snprintf(fdstr, sizeof(fdstr), "/proc/%ld/fd/%s", pid, fddirent->d_name);
+   
         if(stat(fdstr, &stat_buf) < 0)
             continue;
@@ -85 +89 @@
             continue;
 
-        debug("found pty %d for pid %d", i, pid);
+        debug("found pty %d for pid %d", fd, pid);
 
-        ret = mytrace_close(child, i);
-        if(ret < 0)
+        if(!validtos)
         {
-            perror("mytrace_close");
+            ret = mytrace_tcgets(child, fd, &tos);
+            if(ret < 0)
+            {
+                perror("mytrace_tcgets");
+            }
+            else
+            {
+                validtos = 1;
+            }
         }
         to_open[i] = 1;
+        i++;
+    }
+    closedir(fddir);
+    
+    if(i>=(int)sizeof(to_open)-1)
+    {
+        fprintf(stderr, "too many open pty\n");
+        mytrace_detach(child);
+        return -1;
+    }
+
+    if(parent)
+    {
+        ret = mytrace_exec(parent, "/usr/bin/reset");
+        if(ret < 0)
+            mytrace_exit(parent, 0);
+        mytrace_detach(parent);
+        waitpid(pid, NULL, 0); /* Wait for reset to finish before displaying */
+        mytrace_write(child, 2, "\x1b[H\x1b[2J", 7);
+        mytrace_write(child, 2, "\n[Process stolen by neercs]\r\n\n", 30);
     }
 
@@ -124 +155 @@
 
     /* Reopen PTY file descriptors */
-    for(i = 0; i <= 2; i++)
+    for(; i >= 0; i--)
     {
         if(!to_open[i])
             continue;
+        ret = mytrace_close(child, fds[i]);
+        if(ret < 0)
+        {
+            perror("mytrace_close");
+            continue;
+        }
         fd = mytrace_open(child, ptyname, mode[i]);
         if(fd < 0)
         {
             perror("mytrace_open");
+            continue;
         }
-        ret = mytrace_dup2(child, fd, i);
+        if(validtos)
+        {
+            ret = mytrace_tcsets(child, fd, &tos);
+            if(ret < 0)
+            {
+                perror("mytrace_tcsets");
+            }
+            validtos = 0;
+        }
+        ret = mytrace_dup2(child, fd, fds[i]);
         if(ret < 0)
         {

neercs/trunk/src/mytrace.c

@@ -24 +24 @@
 
 #if defined USE_GRAB
+#   include <sys/ioctl.h>
 #   include <sys/ptrace.h>
 #   include <sys/stat.h>
@@ -89 +90 @@
 #define MYCALL_EXIT     8
 #define MYCALL_EXECVE   9
+#define MYCALL_IOCTL   10
 
 #if defined __x86_64__
 /* from unistd_32.h on an amd64 system */
-int syscalls32[] = { 5, 6, 4, 63, 57, 66, 37, 2, 1, 11 };
+int syscalls32[] = { 5, 6, 4, 63, 57, 66, 37, 2, 1, 11, 54 };
 int syscalls64[] =
 #else
@@ -98 +100 @@
 #endif
     { SYS_open, SYS_close, SYS_write, SYS_dup2, SYS_setpgid, SYS_setsid,
-      SYS_kill, SYS_fork, SYS_exit, SYS_execve };
+      SYS_kill, SYS_fork, SYS_exit, SYS_execve, SYS_ioctl };
 
 char const *syscallnames[] =
     { "open", "close", "write", "dup2", "setpgid", "setsid", "kill", "fork",
-      "exit", "execve" };
+      "exit", "execve", "ioctl" };
 
 #endif /* USE_GRAB */
@@ -403 +405 @@
     ret = remote_syscall(t, MYCALL_EXECVE, regs.RSP, argvaddr, envptraddr);
 
+    return ret;
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+int mytrace_tcgets(struct mytrace *t, int fd, struct termios *tos)
+{
+#if defined USE_GRAB
+    char backup_data[4096];
+    struct user_regs_struct regs;
+    size_t size = sizeof(struct termios);
+    int ret, err;
+    
+    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    {
+        perror("PTRACE_GETREGS (tcgets)\n");
+        return -1;
+    }
+    
+    /* Backup the data that we will use */
+    if(memcpy_from_target(t, backup_data, regs.RSP, size) < 0)
+        return -1;
+    
+    ret = remote_syscall(t, MYCALL_IOCTL, fd,TCGETS, regs.RSP);
+    err = errno;
+
+    memcpy_from_target(t, (char *)tos, regs.RSP, size);
+    
+    /* Restore the data */
+    memcpy_into_target(t, regs.RSP, backup_data, size);
+    
+    errno = err;
+    return ret;
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+int mytrace_tcsets(struct mytrace *t, int fd, struct termios *tos)
+{
+#if defined USE_GRAB
+    char backup_data[4096];
+    struct user_regs_struct regs;
+    size_t size = sizeof(struct termios);
+    int ret, err;
+    
+    if(ptrace(PTRACE_GETREGS, t->pid, NULL, &regs) < 0)
+    {
+        perror("PTRACE_GETREGS (tcsets)\n");
+        return -1;
+    }
+
+    /* Backup the data that we will use */
+    if(memcpy_from_target(t, backup_data, regs.RSP, size) < 0)
+        return -1;
+    
+    memcpy_into_target(t, regs.RSP, (char *)tos, size);
+    
+    ret = remote_syscall(t, MYCALL_IOCTL, fd, TCSETS, regs.RSP);
+    err = errno;
+    
+    /* Restore the data */
+    memcpy_into_target(t, regs.RSP, backup_data, size);
+    
+    errno = err;
     return ret;
 #else

neercs/trunk/src/mytrace.h

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