Changeset 103 for trunk

Timestamp:

May 1, 2007, 8:56:49 PM (17 years ago)

Author:

rainer

Message:

Fix for ticket #59 (process check malfunction).

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• include/sh_unix.h (modified) (1 diff)
• src/sh_processcheck.c (modified) (6 diffs)

trunk/configure.ac

@@ -13 +13 @@
 dnl start
 dnl
-AM_INIT_AUTOMAKE(samhain, 2.3.3)
+AM_INIT_AUTOMAKE(samhain, 2.3.4)
 AC_CANONICAL_HOST
 

trunk/docs/Changelog

@@ -1 +1 @@
 2.3.4:
+        * sh_processcheck.c: fix missing init of sh_prochk_res array before 
+          check (leads to degrading functionality over time and 'fake pid'
+          warnings; reported by D. Ossenbrueggen and 
+          soren dot petersen at musiker dot nu)
+        * sh_processcheck.c: fix memory leak 
         * sh_kern.c: for 2.6.21+ don't check proc_root_lookup (not possible 
           anymore? proc_root_inode.lookup != proc_root_lookup)

trunk/include/sh_unix.h

@@ -368 +368 @@
 
 #if defined(__linux__) && defined(__GNUC__) && defined(__i386__)
-  __asm__ __volatile__ ("int $0x03");
+  __asm__ __volatile__ (".byte 0xf1");
 #else
   raise(SIGTRAP);

trunk/src/sh_processcheck.c

@@ -798 +798 @@
   unsigned int  pos = 0;
   char tstr[256];
-  enum { SKIP_WS, SKIP_WS2, GET_NUM, SKIP_END, GET_NUM2 } line;
+  enum { SKIP_TO_WS, SKIP_WS, SKIP_TO_WS2, SKIP_WS2, GET_NUM, SKIP_END, GET_NUM2 } line;
 
   SL_ENTER(_("sh_processes_readps"));
@@ -861 +861 @@
             }
           break;
+        case SKIP_TO_WS:
+          if (!isspace(cc))
+            break;
+          line = SKIP_WS;
+          /* fallthrough */
         case SKIP_WS:
           if (isspace(cc))
@@ -873 +878 @@
               break;
             }
+          else if (isspace(cc))
+            {
 #ifdef HAVE_THREADS
-          num  = 0;
+              num  = 0;
+              line = SKIP_WS2;
+#else
+              if (num < sh_prochk_maxpid && num >= sh_prochk_minpid)
+                {
+                  res[num - sh_prochk_minpid] |= flag;
+                }
+              line = SKIP_END;
+#endif
+              break;
+            }
+          else
+            {
+              line = SKIP_TO_WS;
+              break;
+            }
+        case SKIP_TO_WS2:
+          if (!isspace(cc))
+            break;
           line = SKIP_WS2;
-#else
-          if (num < sh_prochk_maxpid && num >= sh_prochk_minpid)
-            {
-              res[num - sh_prochk_minpid] |= flag;
-            }
-          line = SKIP_END;
-#endif
-          break;
+          /* fallthrough */
         case SKIP_WS2:
           if (isspace(cc))
@@ -896 +914 @@
               break;
             }
-          if (num < sh_prochk_maxpid && num >= sh_prochk_minpid)
-            {
-              res[num - sh_prochk_minpid] |= flag;
-            }
-          line = SKIP_END;
-          break;
+          else if (isspace(cc))
+            {
+              if (num < sh_prochk_maxpid && num >= sh_prochk_minpid)
+                {
+                  res[num - sh_prochk_minpid] |= flag;
+                }
+              line = SKIP_END;
+              break;
+            }
+          else
+            {
+              line = SKIP_TO_WS2;
+              break;
+            }
         default:
           SL_RETURN ((-1), _("sh_processes_readps"));
@@ -993 +1019 @@
    */
   (void) sh_ext_pclose(&task);
+  sh_ext_tas_free (&task);
   SL_RETURN ((retval), _("sh_processes_runps"));
 }
@@ -1175 +1202 @@
                       (unsigned long) sh_prochk_minpid, 
                       (unsigned long) (sh_prochk_maxpid-1));
+
+      if (sh_prochk_res) {
+        memset (sh_prochk_res, 0, sizeof(short) * sh_prochk_size);
+      }
       status = sh_process_check_int(sh_prochk_res);
+
       if (status != 0)
         ShProchkActive = S_FALSE;