Changeset 174

Timestamp:

Aug 27, 2008, 5:40:28 PM (16 years ago)

Author:

katerina

Message:

Fix for tickets #112, #113 (dnmalloc deadlock on fork, hostname portability in test script).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• include/sh_unix.h (modified) (1 diff)
• include/slib.h (modified) (1 diff)
• src/dnmalloc.c (modified) (1 diff)
• src/samhain.c (modified) (1 diff)
• src/sh_entropy.c (modified) (1 diff)
• src/sh_extern.c (modified) (1 diff)
• src/sh_gpg.c (modified) (1 diff)
• src/sh_unix.c (modified) (2 diffs)
• src/slib.c (modified) (1 diff)
• test/test.sh (modified) (1 diff)

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.4.5a)
+AM_INIT_AUTOMAKE(samhain, 2.4.6)
 AC_DEFINE([SAMHAIN], 1, [Application is samhain])
 AC_CANONICAL_HOST

trunk/docs/Changelog

@@ -1 @@
-2.4.5a:
+2.4.6:
+        * fix potential deadlock with dnmalloc upon fork()
+        * fix non-portable use of 'hostname -f' in regression test suite
+          (reported by Borut Podlipnik)
+
+2.4.5a (18-08-2008):
         * fix compile problem in dnmalloc.c (remove prototypes for
           memset/memcpy), problem reported by Juergen Daubert

trunk/include/sh_unix.h

@@ -209 +209 @@
 /* close all files >= fd, except possibly one
  */
-void sh_unix_closeall (int fd, int except);
+void sh_unix_closeall (int fd, int except, int inchild);
 
 

trunk/include/slib.h

@@ -401 +401 @@
    */
   int sl_dropall(int fd, int except);
+  int sl_dropall_dirty(int fd, int except); /* don't deallocate */
 
   /* Check whether file is trustworthy.

trunk/src/dnmalloc.c

@@ -1508 +1508 @@
     pthread_mutex_unlock(&mALLOC_MUTEx); 
 }
-void dnmalloc_fork_child(void) { 
+void dnmalloc_fork_child(void) {
+  int rc;
 #ifdef __GLIBC__
   if (dnmalloc_use_mutex)
-    pthread_mutex_init(&mALLOC_MUTEx, NULL); 
+    {
+      pthread_mutex_unlock (&mALLOC_MUTEx);
+      pthread_mutex_destroy(&mALLOC_MUTEx);
+      rc = pthread_mutex_init(&mALLOC_MUTEx, NULL);
+    } 
 #else
   if (dnmalloc_use_mutex)
-    pthread_mutex_unlock(&mALLOC_MUTEx); 
-#endif
+    rc = pthread_mutex_unlock(&mALLOC_MUTEx); 
+#endif
+  if (rc != 0)
+    {
+      fputs("fork_child failed", stderr);
+      _exit(EXIT_FAILURE);
+    }
 }
 static int dnmalloc_mutex_lock(pthread_mutex_t *mutex)

trunk/src/samhain.c

@@ -1234 +1234 @@
   /* --- Close all but first three file descriptors. ---
    */
-  sh_unix_closeall(3, -1); /* at program start */
+  sh_unix_closeall(3, -1, SL_FALSE); /* at program start */
 
 

trunk/src/sh_entropy.c

@@ -581 +581 @@
       /* don't leak file descriptors
        */
-      sh_unix_closeall (3, -1); /* in child process */
+      sh_unix_closeall (3, -1, SL_TRUE); /* in child process */
 
       /* zero priv info

trunk/src/sh_extern.c

@@ -294 +294 @@
            */
 #if !defined(PDGBFILE)
-          sh_unix_closeall (3, task->com_fd); /* in child process */
+          sh_unix_closeall (3, task->com_fd, SL_TRUE); /* in child process */
 #endif
 

trunk/src/sh_gpg.c

@@ -487 +487 @@
       /* don't leak file descriptors
        */
-      sh_unix_closeall (3, -1); /* in child process */
+      sh_unix_closeall (3, -1, SL_TRUE); /* in child process */
 
       if (NULL == freopen(_("/dev/null"), "r+", stderr))

trunk/src/sh_unix.c

@@ -1246 +1246 @@
 #endif
 
-void sh_unix_closeall (int fd, int except)
+void sh_unix_closeall (int fd, int except, int inchild)
 {
   int fdx = fd;
@@ -1281 +1281 @@
     }
 
-  sl_dropall (fdx, except);
+  if (!inchild)
+    sl_dropall (fdx, except);
+  else
+    sl_dropall_dirty (fdx, except);
 
   SL_RET0(_("sh_unix_closeall"));

trunk/src/slib.c

@@ -2093 +2093 @@
             (void) free(ofiles[fd]->path);
           (void) free(ofiles[fd]);
+          ofiles[fd] = NULL;
+        }
+      ++fd;
+    }
+  return 0;
+}
+
+int sl_dropall_dirty(int fd, int except)
+{
+  while (fd < MAXFD)
+    {
+      if (ofiles[fd] != NULL && fd != except)
+        {
           ofiles[fd] = NULL;
         }

trunk/test/test.sh

@@ -482 +482 @@
 
 find_hostname () {
-    tmp=`hostname -f 2>/dev/null`
-    if [ $? -ne 0 ]; then
+
+    uname -a | grep Linux >/dev/null
+    if [ $? -eq 0 ]; then
+        tmp=`hostname -f 2>/dev/null`
+        if [ $? -ne 0 ]; then
+            tmp=`hostname 2>/dev/null`
+        fi
+    else
         tmp=`hostname 2>/dev/null`
     fi