Changeset 5730

Timestamp:

06/05/09 17:17:29 (4 years ago)

Author:

khali

Message:

From Yuriy Kaminskiy:

Most filesystems (in particular - reiserfs, jfs, xfs, nfs); maybe,

some legacy installation of ext2/3 too) always return dirent->dt_type =
DT_UNKNOWN, so libsensors fails to parse /etc/sensors.d.

Also, symlink (DT_LNK) can point to directory, or FIFO/socket/device

(very bad!) - current check insufficient anyways.

Fixed by always using stat() to check what each entry is, rather than
relying on dirent->dt_type.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/init.c (modified) (5 diffs)

lm-sensors/trunk/CHANGES

@@ -5 +5 @@
   isadump: Use geteuid instead of getuid so that setuid bit works
   isaset: Use geteuid instead of getuid so that setuid bit works
+  libsensors: Don't rely on dirent->dt_type being set
   Makefile: Include generated source files in dependency checking
             Make it possible to skip building of the static library

lm-sensors/trunk/lib/init.c

@@ -24 +24 @@
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <locale.h>
 #include <stdlib.h>
@@ -30 +31 @@
 #include <errno.h>
 #include <dirent.h>
+#include <unistd.h>
 #include "sensors.h"
 #include "data.h"
@@ -121 +123 @@
 static int config_file_filter(const struct dirent *entry)
 {
-        return (entry->d_type == DT_REG || entry->d_type == DT_LNK)
-            && entry->d_name[0] != '.';         /* Skip hidden files */
+        return entry->d_name[0] != '.';         /* Skip hidden files */
 }
 
@@ -144 +145 @@
                 char path[PATH_MAX];
                 FILE *input;
+                struct stat st;
 
                 len = snprintf(path, sizeof(path), "%s/%s", dir,
@@ -151 +153 @@
                         continue;
                 }
+
+                /* Only accept regular files */
+                if (stat(path, &st) < 0 || !S_ISREG(st.st_mode))
+                        continue;
 
                 input = fopen(path, "r");