Skip to contentSkip to conversation

bug in sensors.d reading: not all filesystems

PATCH In review Yuriy Kaminskiy 2 participants 4 messages Jun 4, 2009 – Jun 5, 2009 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bug in sensors.d reading: not all filesystems

Hello!
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.
I've attached [somewhat hackerish] patch to solve both problem.
=== cut !man 3 readdir ===
Currently, only some file systems (among them: ext2, etx3, and ext4) have full support returning the file type in d_type. All applications must properly handle a return of DT_UNKNOWN.
=== cut ===
Maybe, it would be better to remove dt_type check and use stat() always.

lib/init.c renamed from lib/init.c.orig +8 -1
Index: lm_sensors-3.1.0/lib/init.c
===================================================================
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <errno.h>
 #include <dirent.h>
+#include <sys/stat.h>
 #include "sensors.h"
 #include "data.h"
 #include "error.h"
@@ -118,9 +119,10 @@ exit_cleanup:
 	return err;
 }
 
+static int need_check_stat;
 static int config_file_filter(const struct dirent *entry)
 {
-	return (entry->d_type == DT_REG || entry->d_type == DT_LNK)
+	return (entry->d_type == DT_REG || (need_check_stat |= entry->d_type == DT_LNK || entry->d_type == DT_UNKNOWN))
 	    && entry->d_name[0] != '.';		/* Skip hidden files */
 }
 
@@ -129,6 +131,7 @@ static int add_config_from_dir(const cha
 	int count, res, i;
 	struct dirent **namelist;
 
+	need_check_stat = 0;
 	count = scandir(dir, &namelist, config_file_filter, alphasort);
 	if (count < 0) {
 		/* Do not return an error if directory does not exist */
@@ -143,6 +146,7 @@ static int add_config_from_dir(const cha
 		int len;
 		char path[PATH_MAX];
 		FILE *input;
+		struct stat st;
 
 		len = snprintf(path, sizeof(path), "%s/%s", dir,
 			       namelist[i]->d_name);
@@ -151,6 +155,9 @@ static int add_config_from_dir(const cha
 			continue;
 		}
 
+		if (need_check_stat && (stat(path, &st) < 0 || !S_ISREG(st.st_mode)))
+			continue;
+
 		input = fopen(path, "r");
 		if (input) {
 			res = parse_config(input, path);

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#1 lore raw

Re: [lm-sensors] [PATCH] bug in sensors.d reading: not all

Hi Yuriy,

Quoted 10 lines · Yuriy Kaminskiy

Hello!
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.
I've attached [somewhat hackerish] patch to solve both problem.
== cut !man 3 readdir => Currently, only some file systems (among them: ext2, etx3, and ext4)
have full support returning the file type in d_type. All applications
must properly handle a return of DT_UNKNOWN.
== cut =

Thanks for reporting, I had totally missed the fact that not all filesystems implemented this interface.

Quoted 1 line

Maybe, it would be better to remove dt_type check and use stat() always.

Yes, I think so. I don't much like the complexity of your proposed solution. The problem is simple, it should have a simple solution. Performance isn't critical for this part of the code, what matters is robustness and readability.

What about the simplified version below?

Index: lib/init.c
=================================--- lib/init.c (révision 5729)
+++ lib/init.c (copie de travail)
@@ -23,12 +23,14 @@
#define _BSD_SOURCE

#include <sys/types.h>
+#include <sys/stat.h>
#include <locale.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <dirent.h>
+#include <unistd.h>
#include "sensors.h"
#include "data.h"
#include "error.h"
@@ -120,8 +122,7 @@

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 */
}

static int add_config_from_dir(const char *dir)
@@ -143,6 +144,7 @@
int len;
char path[PATH_MAX];
FILE *input;
+ struct stat st;

len = snprintf(path, sizeof(path), "%s/%s", dir,
namelist[i]->d_name);
@@ -151,6 +153,10 @@
continue;
}

+ /* Only accept regular files */
+ if (stat(path, &st) < 0 || !S_ISREG(st.st_mode))
+ continue;
+
input = fopen(path, "r");
if (input) {
res = parse_config(input, path);

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
author Tested-by on v1 1/1
#2 lore raw

Re: [lm-sensors] [PATCH] bug in sensors.d reading: not all

In reply to Yuriy Kaminskiy
Quoted 4 lines · Jean Delvare

Performance isn't critical for this part of the code, what matters is robustness and readability.

What about the simplified version below?

Works fine (lm_sensors 3.1.0-2 from debian sid + this patch, reiserfs root).

Tested-by Yuriy Kaminskiy <yumkam-at-mail.ru>

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#3 lore raw

Re: [lm-sensors] [PATCH] bug in sensors.d reading: not all

In reply to Yuriy Kaminskiy
Quoted 8 lines · Yuriy Kaminskiy
Quoted 4 lines · Jean Delvare

Performance isn't critical for this part of the code, what matters is robustness and readability.

What about the simplified version below?

Works fine (lm_sensors 3.1.0-2 from debian sid + this patch, reiserfs root).

Tested-by Yuriy Kaminskiy <yumkam-at-mail.ru>

Thanks for the quick test. I've committed the patch to SVN, and added it to the list of recommended patches. Probably we'll have a new release soon.

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors