Changeset 397 for trunk

Timestamp:

Mar 27, 2012, 9:05:08 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #293 (deadlock with inotify+suidcheck).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_files.c (modified) (1 diff)

trunk/docs/Changelog

@@ -1 +1 @@
 3.0.3:
+        * fix for deadlock if suid check and inotify are used together
         * fixed problem with samhain_stealth.c (handle input config
           files that don't end with a newline)

trunk/src/sh_files.c

@@ -2788 +2788 @@
       *reported   = item->is_reported;
       retval = 1;
-      goto out;
-    }
+    }
+  SH_MUTEX_UNLOCK(mutex_zfiles);
 
 #if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
-  SH_MUTEX_LOCK(mutex_zglob);
-  for (testPattern = (sh_globstack_t *) zAVLFirst (&cursor, zglobList); 
-       testPattern;
-       testPattern = (sh_globstack_t *) zAVLNext  (&cursor))
-    {
-      if (testPattern->type == SH_LIST_FILE)
+  if (retval == 0)
+    {
+      SH_MUTEX_LOCK(mutex_zglob);
+      for (testPattern = (sh_globstack_t *) zAVLFirst (&cursor, zglobList); 
+           testPattern;
+           testPattern = (sh_globstack_t *) zAVLNext  (&cursor))
         {
-          if (0 == fnmatch(testPattern->name, name, FNM_PATHNAME|FNM_PERIOD))
+          if (testPattern->type == SH_LIST_FILE)
             {
-              *check_mask = testPattern->check_mask;
-              *class      = testPattern->class;
-              retval = 1;
-              break;
+              if (0 == fnmatch(testPattern->name, name, 
+                               FNM_PATHNAME|FNM_PERIOD))
+                {
+                  *check_mask = testPattern->check_mask;
+                  *class      = testPattern->class;
+                  retval = 1;
+                  break;
+                }
+              
             }
-        
         }
-    }
-  SH_MUTEX_UNLOCK(mutex_zglob);
-#endif
- out:
-  ; /* 'label at end of compound statement' */
-  SH_MUTEX_UNLOCK(mutex_zfiles);
+      SH_MUTEX_UNLOCK(mutex_zglob);
+    }
+#endif
+
   return retval;
 }