Changeset 381 for trunk/src

Timestamp:

Dec 2, 2011, 11:18:23 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #279 (checksum flip with --enable-suidcheck).

Location:

trunk/src

Files:

• sh_files.c (modified) (19 diffs)
• sh_suidchk.c (modified) (1 diff)
• sh_unix.c (modified) (2 diffs)

trunk/src/sh_files.c

@@ -697 +697 @@
   SL_ENTER(_("sh_files_parse_mask"));
 
+  myword[0] = '\0';
+
   if (str == NULL)
     {
@@ -705 +707 @@
 
   while (i < l) {
+
     if (str[i] == '\0')
       break;
+
     if (str[i] == ' ' || str[i] == '\t' || str[i] == ',')
       {
@@ -716 +720 @@
       {
         act = +1; ++i;
-        continue;
+        myword[0] = '\0';
+        goto getword;
       }
     else if (str[i] == '-')
       {
         act = -1; ++i;
-        continue;
+        myword[0] = '\0';
+        goto getword;
       }
     else /* a word */
       {
+      getword:
         k = 0;
         while (k < 63 && str[i] != ' ' && str[i] != '\t' && str[i] != ','
@@ -733 +740 @@
         myword[k] = '\0';
 
+        if (sl_strlen(myword) == 0)
+          {
+            SL_RETURN ( (-1), _("sh_files_parse_mask"));
+          }
+
 /* checksum     */
-        if (0 == strncmp(myword, _("CHK"), 3))
+        if      (0 == strcmp(myword, _("CHK")))
           sh_files_set_mask (mask, MODI_CHK, act);
 /* link         */
-        if (0 == strncmp(myword, _("LNK"), 3))
+        else if (0 == strcmp(myword, _("LNK")))
           sh_files_set_mask (mask, MODI_LNK, act);
 /* inode        */
-        if (0 == strncmp(myword, _("RDEV"), 3))
+        else if (0 == strcmp(myword, _("RDEV")))
           sh_files_set_mask (mask, MODI_RDEV, act);
 /* inode        */
-        if (0 == strncmp(myword, _("INO"), 3))
+        else if (0 == strcmp(myword, _("INO")))
           sh_files_set_mask (mask, MODI_INO, act);
 /* user         */
-        if (0 == strncmp(myword, _("USR"), 3))
+        else if (0 == strcmp(myword, _("USR")))
           sh_files_set_mask (mask, MODI_USR, act);
 /* group        */
-        if (0 == strncmp(myword, _("GRP"), 3))
+        else if (0 == strcmp(myword, _("GRP")))
           sh_files_set_mask (mask, MODI_GRP, act);
 /* mtime        */
-        if (0 == strncmp(myword, _("MTM"), 3))
+        else if (0 == strcmp(myword, _("MTM")))
           sh_files_set_mask (mask, MODI_MTM, act);
 /* ctime        */
-        if (0 == strncmp(myword, _("CTM"), 3))
+        else if (0 == strcmp(myword, _("CTM")))
           sh_files_set_mask (mask, MODI_CTM, act);
 /* atime        */
-        if (0 == strncmp(myword, _("ATM"), 3))
+        else if (0 == strcmp(myword, _("ATM")))
           sh_files_set_mask (mask, MODI_ATM, act);
 /* size         */
-        if (0 == strncmp(myword, _("SIZ"), 3))
+        else if (0 == strcmp(myword, _("SIZ")))
           sh_files_set_mask (mask, MODI_SIZ, act);
 /* file mode    */
-        if (0 == strncmp(myword, _("MOD"), 3))
+        else if (0 == strcmp(myword, _("MOD")))
           sh_files_set_mask (mask, MODI_MOD, act);
 /* hardlinks    */
-        if (0 == strncmp(myword, _("HLN"), 3))
+        else if (0 == strcmp(myword, _("HLN")))
           sh_files_set_mask (mask, MODI_HLN, act);
 /* size may grow */
-        if (0 == strncmp(myword, _("GROW"), 3))
+        else if (0 == strcmp(myword, _("SGROW")))
           sh_files_set_mask (mask, MODI_SGROW, act);
 /* use prelink */
-        if (0 == strncmp(myword, _("PRE"), 3))
+        else if (0 == strcmp(myword, _("PRE")))
           sh_files_set_mask (mask, MODI_PREL, act);
 /* get content */
-        if (0 == strncmp(myword, _("TXT"), 3))
+        else if (0 == strcmp(myword, _("TXT")))
           sh_files_set_mask (mask, MODI_TXT, act);
 /* get content */
-        if (0 == strncmp(myword, _("AUDIT"), 3))
+        else if (0 == strcmp(myword, _("AUDIT")))
           sh_files_set_mask (mask, MODI_AUDIT, act);
+        else
+          {
+            SL_RETURN ( (-1), _("sh_files_parse_mask"));
+          }
+        act       = 0;
+        myword[0] = '\0';
       }
   }
@@ -840 +858 @@
     {
     case SH_LEVEL_READONLY:
-      return (unsigned long) mask_READONLY;
+      return (unsigned long) (mask_READONLY | MODI_INIT);
     case SH_LEVEL_ATTRIBUTES:
-      return (unsigned long) mask_ATTRIBUTES;
+      return (unsigned long) (mask_ATTRIBUTES | MODI_INIT);
     case SH_LEVEL_LOGFILES:
-      return (unsigned long) mask_LOGFILES;
+      return (unsigned long) (mask_LOGFILES | MODI_INIT);
     case SH_LEVEL_LOGGROW:
-      return (unsigned long) mask_LOGGROW;
+      return (unsigned long) (mask_LOGGROW | MODI_INIT);
     case SH_LEVEL_ALLIGNORE:
-      return (unsigned long) mask_ALLIGNORE;
+      return (unsigned long) (mask_ALLIGNORE | MODI_INIT);
     case SH_LEVEL_NOIGNORE:
-      return (unsigned long) mask_NOIGNORE;
+      return (unsigned long) (mask_NOIGNORE | MODI_INIT);
     case SH_LEVEL_USER0:
-      return (unsigned long) mask_USER0;
+      return (unsigned long) (mask_USER0 | MODI_INIT);
     case SH_LEVEL_USER1:
-      return (unsigned long) mask_USER1;
+      return (unsigned long) (mask_USER1 | MODI_INIT);
     case SH_LEVEL_USER2:
-      return (unsigned long) mask_USER2;
+      return (unsigned long) (mask_USER2 | MODI_INIT);
     case SH_LEVEL_USER3:
-      return (unsigned long) mask_USER3;
+      return (unsigned long) (mask_USER3 | MODI_INIT);
     case SH_LEVEL_USER4:
-      return (unsigned long) mask_USER4;
+      return (unsigned long) (mask_USER4 | MODI_INIT);
     case SH_LEVEL_PRELINK:
-      return (unsigned long) mask_PRELINK;
+      return (unsigned long) (mask_PRELINK | MODI_INIT);
     default:
       return (unsigned long) 0;
@@ -907 +925 @@
 #endif
 
-int sh_files_push_file_int (int class, const char * str_s, size_t len)
+int sh_files_push_file_int (int class, const char * str_s, size_t len, unsigned long check_mask)
 {
   dirstack_t * new_item_ptr;
@@ -923 +941 @@
   new_item_ptr->name           = fileName;
   new_item_ptr->class          = class;
-  new_item_ptr->check_mask     = sh_files_maskof(class);
+  new_item_ptr->check_mask     = check_mask;
   new_item_ptr->rdepth         = 0;
   new_item_ptr->checked        = S_FALSE;
@@ -982 +1000 @@
 }
 
-int sh_files_push_dir_int (int class, char * tail, size_t len, int rdepth);
+int sh_files_push_dir_int (int class, char * tail, size_t len, int rdepth, unsigned long check_mask);
 
 #ifdef HAVE_GLOB_H
@@ -1005 +1023 @@
 
   int     count = 0;
-  volatile unsigned long check_mask = check_mask_in;
+  volatile unsigned long check_mask = (flag == 0) ? sh_files_maskof(class) : check_mask_in;
   
   SL_ENTER(_("sh_files_pushglob"));
@@ -1028 +1046 @@
           new_item_ptr->name           = fileName;
           new_item_ptr->class          = class;
-          new_item_ptr->check_mask     = (flag == 0) ? sh_files_maskof(class) : check_mask;
+          new_item_ptr->check_mask     = check_mask;
           new_item_ptr->rdepth         = rdepth;
           new_item_ptr->type           = type;
@@ -1057 +1075 @@
             {
               count += sh_files_push_file_int (class, pglob.gl_pathv[gloop], 
-                                               sl_strlen(pglob.gl_pathv[gloop]));
+                                               sl_strlen(pglob.gl_pathv[gloop]), check_mask);
             }
           else
@@ -1064 +1082 @@
 
               count += sh_files_push_dir_int  (class, pglob.gl_pathv[gloop], 
-                                               sl_strlen(pglob.gl_pathv[gloop]), rdepth);
+                                               sl_strlen(pglob.gl_pathv[gloop]), rdepth, check_mask);
             }
         }
@@ -1275 +1293 @@
   if (0 == sh_files_has_metachar(p))
     {
-      sh_files_push_file_int (class, p, len);
+      sh_files_push_file_int (class, p, len, sh_files_maskof(class));
     }
   else
@@ -1283 +1301 @@
 
 #else
-  sh_files_push_file_int (class, p, len);
+  sh_files_push_file_int (class, p, len, sh_files_maskof(class));
 #endif
 
@@ -1534 +1552 @@
 }
 
-int sh_files_push_dir_int (int class, char * tail, size_t len, int rdepth)
+int sh_files_push_dir_int (int class, char * tail, size_t len, int rdepth, unsigned long check_mask)
 {
   zAVLTree   * tree;
@@ -1550 +1568 @@
   new_item_ptr->name           = dirName;
   new_item_ptr->class          = class;
-  new_item_ptr->check_mask     = sh_files_maskof(class);
+  new_item_ptr->check_mask     = check_mask;
   new_item_ptr->rdepth         = rdepth;
   new_item_ptr->checked        = S_FALSE;
@@ -1600 +1618 @@
   else
     {
-      unsigned long mask = sh_files_maskof(class);
-      if (MODI_AUDIT_ENABLED(mask))
+      if (MODI_AUDIT_ENABLED(check_mask))
         {
           sh_audit_mark(tail);
@@ -1713 +1730 @@
   if (0 == sh_files_has_metachar(tail))
     {
-      sh_files_push_dir_int (class, tail, len, rdepth);
+      sh_files_push_dir_int (class, tail, len, rdepth, sh_files_maskof(class));
     }
   else
@@ -1720 +1737 @@
     }
 #else  
-  sh_files_push_dir_int (class, tail, len, rdepth);
+  sh_files_push_dir_int (class, tail, len, rdepth, sh_files_maskof(class));
 #endif
 

trunk/src/sh_suidchk.c

@@ -1188 +1188 @@
             int dummy;
             int class;
-            unsigned long check_mask;
+            unsigned long check_mask = 0;
 
             theFile = SH_ALLOC(sizeof(file_type));

trunk/src/sh_unix.c

@@ -3643 +3643 @@
   SL_ENTER(_("sh_unix_getinfo"));
 
+  if (!MODI_INITIALIZED(theFile->check_mask))
+    {
+      tmp2 = sh_util_safe_name (theFile->fullpath);
+      SH_MUTEX_LOCK(mutex_thread_nolog);
+      sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_E_SUBGPATH,
+                       _("Uninitialized check mask"), _("sh_unix_getinfo"),
+                       tmp2);
+      SH_MUTEX_UNLOCK(mutex_thread_nolog);
+      SH_FREE(tmp2);
+    }
+
   /* Take the address to keep gcc from putting it into a register. 
    * Avoids the 'clobbered by longjmp' warning. 
@@ -3808 +3819 @@
               sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);
             }
-          else if ((theFile->check_mask & MODI_PREL) != 0 && 
+          else if ((theFile->check_mask & MODI_PREL) != 0 &&
                    S_TRUE == sh_prelink_iself(rval_open, fbuf.st_size, 
                                               alert_timeout, theFile->fullpath))