Changeset 516 for trunk/src/sh_suidchk.c

Timestamp:

Oct 31, 2016, 8:31:24 PM (8 years ago)

Author:

katerina

Message:

Fix for ticket #409 and #410 (unprivileged suidcheck and gcc 6.2 compiler warnings).

File:

• trunk/src/sh_suidchk.c (modified) (9 diffs)

trunk/src/sh_suidchk.c

@@ -997 +997 @@
  * by longjmp' warning. And no, 'volatile' proved insufficient.
  */
-static void * sh_dummy_dirlist = NULL;
-static void * sh_dummy_itmp    = NULL;
+void * sh_dummy_idirlist = NULL;
+void * sh_dummy_itmp     = NULL;
 
 
@@ -1028 +1028 @@
    * Avoids the 'clobbered by longjmp' warning. 
    */
-  sh_dummy_dirlist = (void*) &dirlist;
-  sh_dummy_itmp    = (void*) &tmp;
+  sh_dummy_idirlist = (void*) &dirlist;
+  sh_dummy_itmp     = (void*) &tmp;
 
   if (iname == NULL)
@@ -1146 +1146 @@
                                     ShSuidchkFps) , 0);
       }
-              
+
     status = (int) retry_lstat(FIL__, __LINE__, tmpcat, &buf);
 
@@ -1186 +1186 @@
              */
             fs = filesystem_type (tmpcat, tmpcat, &buf);
+
             if (fs != NULL 
 #ifndef SH_SUIDTESTDIR
@@ -1520 +1521 @@
   status = sh_suidchk_check_internal (SH_SUIDTESTDIR);
 #else
+  #error
   status = sh_suidchk_check_internal ("/");
 #endif
@@ -2211 +2213 @@
   current_dev = statp->st_dev;
   current_fstype = filesystem_type_uncached (path, relpath, statp);
+  
   return current_fstype;
 }
@@ -2232 +2235 @@
 #endif
 
-#ifdef FSTYPE_MNTENT            /* 4.3BSD, SunOS, HP-UX, Dynix, Irix.  */
+#ifdef FSTYPE_MNTENT            /* 4.3BSD, SunOS, HP-UX, Dynix, Irix,Linux  */
   char *table = MOUNTED;
   FILE *mfp;
@@ -2294 +2297 @@
               volatile int  elevel = SH_ERR_ERR;
               size_t tlen = strlen(mnt->mnt_dir);
-
+              
               if (tlen >= 6 && 0 == strcmp(&((mnt->mnt_dir)[tlen-6]), _("/.gvfs")))
                 elevel = SH_ERR_NOTICE;
               else if (tlen >= 5 && 0 == strcmp(&((mnt->mnt_dir)[tlen-5]), _("/gvfs")))
                 elevel = SH_ERR_NOTICE;
-
+              else if (0 == strcmp (mnt->mnt_type, _("tracefs")))
+                elevel = SH_ERR_NOTICE;
+              
               sl_snprintf(errmsg, sizeof(errmsg), _("stat(%s) failed"),
                           mnt->mnt_dir);
@@ -2307 +2312 @@
                                _("filesystem_type_uncached") );
               SH_MUTEX_UNLOCK(mutex_thread_nolog);
-              return NULL;
+              continue;
             }
           dev = disk_stats.st_dev;