Changeset 433 for trunk

Timestamp:

Apr 29, 2013, 7:32:19 PM (12 years ago)

Author:

katerina

Message:

Fix for ticket #338 (steady growth of memory usage).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• include/samhain.h (modified) (1 diff)
• src/samhain.c (modified) (2 diffs)
• src/sh_fInotify.c (modified) (6 diffs)
• src/sh_files.c (modified) (5 diffs)

trunk/docs/Changelog

@@ -1 +1 @@
 3.0.12:
+        * Fix for incorrect use of sh_inotify_add_watch_later
+          which causes a steady increase in memory usage
+          (issue reported by Maxime V)
+        * Fix for potential minor memory leak
         * Fix for bug in negated conditionals for config file
           (reported by M. Ward)

trunk/include/samhain.h

@@ -208 +208 @@
 #define SH_INOTIFY_NEEDINIT (1<<2)
 #define SH_INOTIFY_INSCAN   (1<<3)
+#define SH_INOTIFY_IFUSED(a)   if ((sh.flag.inotify & SH_INOTIFY_USE) != 0) { a }
 
 

trunk/src/samhain.c

@@ -2023 +2023 @@
           (flag_check_1 == 1 || flag_check_2 == 1))
         {
-          sh.flag.inotify |= SH_INOTIFY_INSCAN;
+          SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_INSCAN; );
           /* Refresh list files matching glob patterns.
            */
@@ -2088 +2088 @@
           flag_check_2 = 0;
           check_done   = 1;
-          sh.flag.inotify &= ~SH_INOTIFY_INSCAN;
-          sh.flag.inotify &= ~SH_INOTIFY_DOSCAN;
+          SH_INOTIFY_IFUSED( sh.flag.inotify &= ~SH_INOTIFY_INSCAN; );
+          SH_INOTIFY_IFUSED( sh.flag.inotify &= ~SH_INOTIFY_DOSCAN; );
 
           (void) sh_prelink_run (NULL, NULL, 0);

trunk/src/sh_fInotify.c

@@ -130 +130 @@
     {
       /* Init from main thread */
-      sh.flag.inotify |= SH_INOTIFY_DOSCAN;
-      sh.flag.inotify |= SH_INOTIFY_NEEDINIT;
+      SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_DOSCAN;   );
+      SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_NEEDINIT; );
 
       if (0 == sh_pthread_create(sh_threaded_module_run, (void *)arg))
@@ -154 +154 @@
       /* Reconfigure from main thread */
       /* sh_fInotify_init_internal(); */
-      sh.flag.inotify |= SH_INOTIFY_DOSCAN;
-      sh.flag.inotify |= SH_INOTIFY_NEEDINIT;
+      SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_DOSCAN;   );
+      SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_NEEDINIT; );
       return SH_MOD_THREAD;
     }
@@ -226 +226 @@
     {
       count = 0; /* Re-expand glob patterns to discover added files. */
-      sh.flag.inotify |= SH_INOTIFY_INSCAN;
+      SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_INSCAN; );
       sh_files_check_globFilePatterns();
-      sh.flag.inotify &= ~SH_INOTIFY_INSCAN;
-      sh.flag.inotify |= SH_INOTIFY_NEEDINIT;
+      SH_INOTIFY_IFUSED( sh.flag.inotify &= ~SH_INOTIFY_INSCAN;  );
+      SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_NEEDINIT; );
     }
 
@@ -396 +396 @@
    * DOSCAN is finished, hence wouldn't call init().
    */
-  sh.flag.inotify &= ~SH_INOTIFY_NEEDINIT;
+  SH_INOTIFY_IFUSED( sh.flag.inotify &= ~SH_INOTIFY_NEEDINIT; );
 
   return 0;
@@ -474 +474 @@
   else if ((event->mask & IN_Q_OVERFLOW) != 0)
     {
-      sh.flag.inotify |= SH_INOTIFY_DOSCAN;
-      sh.flag.inotify |= SH_INOTIFY_NEEDINIT;
+      SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_DOSCAN;   );
+      SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_NEEDINIT; );
+
       SH_MUTEX_LOCK(mutex_thread_nolog);
       sh_error_handle(SH_ERR_WARN, FIL__, __LINE__, event->wd, MSG_E_SUBGEN, 
@@ -639 +640 @@
           if (event->mask & IN_ISDIR)
             {
-              sh.flag.inotify |= SH_INOTIFY_INSCAN;
+              SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_INSCAN;   );
               sh_files_checkdir (classD, check_maskD, rdepthD, 
                                  path, (event->len > 0) ? event->name : NULL);
-              sh.flag.inotify &= ~SH_INOTIFY_INSCAN;
-              sh.flag.inotify |= SH_INOTIFY_NEEDINIT;
+              SH_INOTIFY_IFUSED( sh.flag.inotify &= ~SH_INOTIFY_INSCAN;  );
+              SH_INOTIFY_IFUSED( sh.flag.inotify |= SH_INOTIFY_NEEDINIT; );
               sh_dirs_reset  ();
               sh_files_reset ();

trunk/src/sh_files.c

@@ -2010 +2010 @@
       if (theFile->link_path)   SH_FREE(theFile->link_path);
       SH_FREE(theFile);
+      SH_FREE(tmpname);
       SL_RETURN((0), _("sh_files_checkdir"));
     }
@@ -2015 +2016 @@
   if (status == -1)
     {
-      SH_FREE(tmpname); 
       if (theFile->attr_string) SH_FREE(theFile->attr_string);
       if (theFile->link_path)   SH_FREE(theFile->link_path);
       SH_FREE(theFile);
+      SH_FREE(tmpname);
       SL_RETURN((-1), _("sh_files_checkdir"));
     }
@@ -2028 +2029 @@
                        tmpname);
       ++sh.statistics.files_nodir;
-      SH_FREE(tmpname); 
       if (theFile->attr_string) SH_FREE(theFile->attr_string);
       if (theFile->link_path)   SH_FREE(theFile->link_path);
       SH_FREE(theFile);
+      SH_FREE(tmpname);
       SL_RETURN((-1), _("sh_files_checkdir"));
     }
@@ -2127 +2128 @@
       {
         SH_FREE(theDir);
+        SH_FREE(tmpname);
         SL_RETURN((0), _("sh_files_checkdir"));
       }
@@ -2366 +2368 @@
         SH_FREE(theDir);
         sh_dummy_dirlist = NULL;
+        SH_FREE(tmpname);
         SL_RETURN((0), _("sh_files_checkdir"));
       }