Changeset 399 for trunk

Timestamp:

Mar 27, 2012, 10:12:22 PM (12 years ago)

Author:

katerina

Message:

Fix for ticket #296 (sh_processes_readps may hang with EAGAIN).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_processcheck.c (modified) (3 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 3.0.3:
+        * make sure sh_processes_readps cannot hang forever
         * fix for deadlock if sh_processes_readps hangs
         * fix for deadlock if suid check and inotify are used together
+          (reported by A. Jack)
         * fixed problem with samhain_stealth.c (handle input config
           files that don't end with a newline)

trunk/src/sh_processcheck.c

@@ -553 +553 @@
   SL_RETURN((0), _("sh_prochk_set_psarg"));
 #else
+  (void) str;
   sh_prochk_psarg = NULL;
   SL_RETURN((-1), _("sh_prochk_set_psarg"));
@@ -868 +869 @@
   char c;
   unsigned int  pos = 0;
+#define SH_TWAIT_MAX 60
+  volatile unsigned int  twait = 0;
   char tstr[256];
   enum { SKIP_TO_WS, SKIP_WS, SKIP_TO_WS2, SKIP_WS2, GET_NUM, SKIP_END, GET_NUM2 } line;
@@ -891 +894 @@
               break;
             }
-          else if (errno == EAGAIN)
+          else if ((errno == EAGAIN) && (twait < SH_TWAIT_MAX))
             {
               clearerr(in);
+              retry_msleep(1, 0);
+              ++twait;
               continue;
             }