Changeset fe18d4a75a7c5281188bff42c2bdbc53f1ec9ee8

Timestamp:

11/09/09 09:42:10 (2 years ago)

Author:

Erwan Velu <erwan.velu@…>

Children:

590f9d031162dd2377980c4daadff7cc85cdff02

Parents:

2adc666fb9ef812bcd7d509b2501ccaab00c4c22

git-committer:

Erwan Velu <erwan.velu@free.fr> / 2009-11-09T10:42:10Z+0100

Message:

pci: Prevent kernel modules to be listed twice

Impact: Prevent duplicated modules

If both get_module_name_from_pcimap() & get_module_name_from_alias()
are called, we didn't checked if the module we are detecting already got
detected. This leads to a situation where modules got listed twice.

This patch add a test to insure that we aren't adding an already
detected module.

Files:

• com32/lib/pci/scan.c (modified) (2 diffs)

com32/lib/pci/scan.c

@@ -155 +155 @@
           (int_sub_vendor_id & dev->sub_vendor)
           == dev->sub_vendor) {
-        strcpy(dev->dev_info->linux_kernel_module[dev->dev_info->linux_kernel_module_count], module_name);
-        dev->dev_info->linux_kernel_module_count++;
+              bool found=false;
+              
+              /* Scan all known kernel modules for this pci device */
+              for (int i=0; i<dev->dev_info->linux_kernel_module_count; i++) {
+
+              /* Try to detect if we already knew the same kernel module*/
+               if (strstr(dev->dev_info->linux_kernel_module[i], module_name)) {
+                      found=true;
+                      break;
+               }
+              }
+              /* If we don't have this kernel module, let's add it */
+              if (!found) {
+                strcpy(dev->dev_info->linux_kernel_module[dev->dev_info->linux_kernel_module_count], module_name);
+                dev->dev_info->linux_kernel_module_count++;
+              }
       }
     }
@@ -703 +717 @@
           (int_sub_vendor_id & dev->sub_vendor)
           == dev->sub_vendor) {
-        strcpy(dev->dev_info->linux_kernel_module[dev->dev_info->linux_kernel_module_count], module_name);
-        dev->dev_info->linux_kernel_module_count++;
+              bool found=false;
+              
+              /* Scan all known kernel modules for this pci device */
+              for (int i=0; i<dev->dev_info->linux_kernel_module_count; i++) {
+
+              /* Try to detect if we already knew the same kernel module*/
+               if (strstr(dev->dev_info->linux_kernel_module[i], module_name)) {
+                      found=true;
+                      break;
+               }
+              }
+              /* If we don't have this kernel module, let's add it */
+              if (!found) {
+                strcpy(dev->dev_info->linux_kernel_module[dev->dev_info->linux_kernel_module_count], module_name);
+                dev->dev_info->linux_kernel_module_count++;
+              }
       }
     }