Changeset 321 for trunk/src/sh_sub.c

Timestamp:

Mar 17, 2011, 10:07:44 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #240: The samhain_kmem kernel module should be loaded earlier

File:

• trunk/src/sh_sub.c (modified) (14 diffs)

trunk/src/sh_sub.c

@@ -20 +20 @@
 #include "config_xor.h"
 
+/* 0->1 for debug */ 
+#if 0
+#define SH_SUB_DBG 1
+#endif
+
 #ifndef NULL
 #if !defined(__cplusplus)
@@ -62 +67 @@
 static ssize_t sh_sub_read(int fd, void *buf, size_t count);
 
-static void sh_kill_sub()
+void sh_kill_sub()
 {
   SH_MUTEX_LOCK(mutex_sub);
+
   if (sh_child_pid != -1)
     {
       int status;
+#ifdef WCONTINUED
+      int wflags = WNOHANG|WUNTRACED|WCONTINUED;
+#else
+      int wflags = WNOHANG|WUNTRACED;
+#endif
 
       close (parent2child[1]);
       close (child2parent[0]);
 
-      fprintf(stderr, "FIXME kill_sub %d\n", (int) sh_child_pid);
+      /* fprintf(stderr, "FIXME kill_sub %d\n", (int) sh_child_pid); */
 
       /* Let's be rude. */
@@ -80 +91 @@
 
       if (sh_wait_ret == 0)
-        sh_wait_ret = waitpid(          -1, &status, WNOHANG|WUNTRACED);
+        sh_wait_ret = waitpid(          -1, &status, wflags);
       else
-        sh_wait_ret = waitpid(sh_child_pid, &status, WNOHANG|WUNTRACED);
+        sh_wait_ret = waitpid(sh_child_pid, &status, wflags);
 
       sh_child_pid = -1;
     }
+
   SH_MUTEX_UNLOCK(mutex_sub);
   return;
@@ -93 +105 @@
 {
   pid_t res;
-  int   retval = 0;
+  volatile int   retval = 0;
 
   SH_MUTEX_LOCK(mutex_sub);
@@ -162 +174 @@
               ++fd;
             }
+
+          /*
+          for (i = 0; i < 3; ++i)
+            {
+              if ( fcntl(i, F_GETFL, 0) == (-1))
+                (void) open(_("/dev/null"), O_RDWR, 0);
+            }
+          */
 
           /* reset signal handling 
@@ -275 +295 @@
   do {
 
-    // fprintf(stderr, "FIXME wait_com polling..\n");
+    /* fprintf(stderr, "FIXME wait_com polling..\n"); */
 
     do {
@@ -307 +327 @@
             outbuf.errnum = errno;
 
-            // fprintf(stderr, "FIXME wait_com writing..\n");
+            /* fprintf(stderr, "FIXME wait_com writing..\n"); */
 
             ret = sh_sub_write(child2parent[1], &outbuf, sizeof(outbuf));
             if (ret < 0)
               {
-                fprintf(stderr, "FIXME wait_com return 1\n");
+                /* fprintf(stderr, "FIXME wait_com return 1\n"); */
                 return;
               }
@@ -318 +338 @@
         else /* sh_sub_read() < 0 */
           {
-            fprintf(stderr, "FIXME wait_com return 2\n");
+            /* fprintf(stderr, "FIXME wait_com return 2\n"); */
             return;
           }
       }
     
-    // fprintf(stderr, "FIXME wait_com next..\n");
+    /* fprintf(stderr, "FIXME wait_com next..\n"); */
 
   } while (1 == 1);
@@ -362 +382 @@
 }
 
+#ifdef SH_SUB_DBG
+#include <stdarg.h>
+static void debug_it (const char *fmt, ...)
+{
+  char msg[256];
+  va_list ap;
+
+  int fd = open("debug.it", O_CREAT|O_WRONLY|O_APPEND, 0666);
+
+  va_start(ap, fmt);
+  vsnprintf(msg, sizeof(msg), fmt, ap);  /* flawfinder: ignore */
+  va_end(ap);
+
+  write(fd, msg, strlen(msg));
+  write(fd, "\n", 1);
+  close(fd);
+  return;
+}
+#endif
+
 static int sh_sub_stat_int(const char *path, struct stat *buf, char command)
 {
@@ -397 +437 @@
  start:
 
+#ifdef SH_SUB_DBG
+  debug_it("%d sh_child_pid %d\n", (int)getpid(), (int) sh_child_pid);
+#endif
+
   if (sh_child_pid == -1)
     sh_create_sub();
 
-  // fprintf(stderr, "FIXME stat_sub %s\n", inbuf.path);
+#ifdef SH_SUB_DBG
+  debug_it("%d stat_sub %s (%d)\n", (int)getpid(), inbuf.path, (int) sh_child_pid);
+#endif
 
   SH_MUTEX_LOCK(mutex_sub_work);
@@ -412 +458 @@
     }
 
-  // fprintf(stderr, "FIXME stat_sub polling..\n");
+#ifdef SH_SUB_DBG
+  debug_it("%d stat_sub polling..\n", (int)getpid());
+#endif
 
   pfds.fd     = child2parent[0];
@@ -428 +476 @@
     }
 
-  // fprintf(stderr, "FIXME stat_sub reading..\n");
+#ifdef SH_SUB_DBG
+  debug_it("%d stat_sub reading..\n", (int)getpid());
+#endif
 
   retval = sh_sub_read (child2parent[0], &outbuf, sizeof(outbuf));
@@ -444 +494 @@
   if      (sflag == 0)
     {
-      // fprintf(stderr, "FIXME stat_sub done..\n");
+#ifdef SH_SUB_DBG
+      debug_it("%d stat_sub done..\n", (int)getpid());
+#endif
       memcpy(buf, &(outbuf.sbuf), sizeof(struct stat));
       errno = outbuf.errnum;
@@ -451 +503 @@
   else if (sflag == 1)
     {
+#ifdef SH_SUB_DBG
+      debug_it("%d stat_sub error..\n", (int)getpid());
+#endif
       /* could not read, thus subprocess may have gone */
+      sflag = 0;
       goto start;
     }