Changeset 4760

Timestamp:

09/05/07 10:19:42 (6 years ago)

Author:

khali

Message:

Store the feature list length separately instead of null-terminating
the list. This make it possible to check for out-of-bound indexes
without walking the entire list, so that direct look-ups are safer.

Location:

lm-sensors/branches/lm-sensors-3.0.0/lib

Files:

• access.c (modified) (3 diffs)
• data.h (modified) (1 diff)
• init.c (modified) (2 diffs)
• sysfs.c (modified) (3 diffs)

lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

@@ -97 +97 @@
         for (i = 0; i < sensors_proc_chips_count; i++)
                 if (sensors_match_chip(&sensors_proc_chips[i].chip, chip)) {
+                        if (feature < 0 ||
+                            feature >= sensors_proc_chips[i].feature_count)
+                                return NULL;
                         return sensors_proc_chips[i].feature + feature;
                 }
@@ -114 +117 @@
                 if (sensors_match_chip(&sensors_proc_chips[i].chip, chip)) {
                         features = sensors_proc_chips[i].feature;
-                        for (j = 0; features[j].data.name; j++)
+                        for (j = 0; j < sensors_proc_chips[i].feature_count; j++)
                                 if (!strcasecmp(features[j].data.name, feature))
                                         return features + j;
@@ -351 +354 @@
                 if (sensors_match_chip(&sensors_proc_chips[i].chip, name)) {
                         feature_list = sensors_proc_chips[i].feature;
-                        while (feature_list[*nr].data.name
+                        while (*nr < sensors_proc_chips[i].feature_count
                             && sensors_get_ignored(name, &feature_list[*nr]))
                                 (*nr)++;
-                        if (!feature_list[*nr].data.name)
+                        if (*nr == sensors_proc_chips[i].feature_count)
                                 return NULL;
                         return &feature_list[(*nr)++].data;

lm-sensors/branches/lm-sensors-3.0.0/lib/data.h

@@ -144 +144 @@
         struct sensors_chip_name chip;
         struct sensors_chip_feature *feature;
+        int feature_count;
 } sensors_chip_features;
 

lm-sensors/branches/lm-sensors-3.0.0/lib/init.c

@@ -52 +52 @@
 }
 
-static void free_chip_features(sensors_chip_feature *features)
+static void free_chip_features(sensors_chip_features *features)
 {
         int i;
 
-        for (i = 0; features[i].data.name; i++)
-                free(features[i].data.name);
-        free(features);
+        for (i = 0; i < features->feature_count; i++)
+                free(features->feature[i].data.name);
+        free(features->feature);
 }
 
@@ -141 +141 @@
         for (i = 0; i < sensors_proc_chips_count; i++) {
                 free_chip_name(&sensors_proc_chips[i].chip);
-                free_chip_features(sensors_proc_chips[i].feature);
+                free_chip_features(&sensors_proc_chips[i]);
         }
         free(sensors_proc_chips);

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

@@ -65 +65 @@
                                      struct sysfs_device *sysdir)
 {
-        int i, type, fnum = 1;
+        int i, type, fnum = 0;
         struct sysfs_attribute *attr;
         struct dlist *attrs;
@@ -161 +161 @@
         }
 
-        if (fnum == 1) { /* No feature */
+        if (!fnum) { /* No feature */
                 chip->feature = NULL;
                 goto exit_free;
@@ -195 +195 @@
 
         chip->feature = dyn_features;
+        chip->feature_count = fnum;
 
 exit_free: