Don't assume VMD sysfs path ends with a disk entry

[thirdparty/mdadm.git] / platform-intel.c

diff --git a/platform-intel.c b/platform-intel.c
index 88818f340b1311b038a433f4dbbe4a29b0f96a21..7ad88315025a1f1acc428773769433593e00f282 100644 (file)
--- a/platform-intel.c
+++ b/platform-intel.c
@@ -48,9 +48,9 @@ static void free_sys_dev(struct sys_dev **list)
 struct sys_dev *find_driver_devices(const char *bus, const char *driver)
 {
        /* search sysfs for devices driven by 'driver' */
-       char path[292];
-       char link[256];
-       char *c;
+       char path[PATH_MAX];
+       char link[PATH_MAX];
+       char *c, *p;
        DIR *driver_dir;
        struct dirent *de;
        struct sys_dev *head = NULL;
@@ -123,6 +123,22 @@ struct sys_dev *find_driver_devices(const char *bus, const char *driver)
                if (devpath_to_ll(path, "class", &class) != 0)
                        continue;
 
+               /*
+                * Each VMD device (domain) adds separate PCI bus, it is better
+                * to store path as a path to that bus (easier further
+                * determination which NVMe dev is connected to this particular
+                * VMD domain).
+                */
+               if (type == SYS_DEV_VMD) {
+                       sprintf(path, "/sys/bus/%s/drivers/%s/%s/domain/device",
+                               bus, driver, de->d_name);
+               }
+               p = realpath(path, NULL);
+               if (p == NULL) {
+                       pr_err("Unable to get real path for '%s'\n", path);
+                       continue;
+               }
+
                /* start / add list entry */
                if (!head) {
                        head = xmalloc(sizeof(*head));
@@ -140,16 +156,9 @@ struct sys_dev *find_driver_devices(const char *bus, const char *driver)
                list->dev_id = (__u16) dev_id;
                list->class = (__u32) class;
                list->type = type;
-               /* Each VMD device (domain) adds separate PCI bus, it is better to
-                * store path as a path to that bus (easier further determination which
-                * NVMe dev is connected to this particular VMD domain).
-                */
-               if (type == SYS_DEV_VMD) {
-                       sprintf(path, "/sys/bus/%s/drivers/%s/%s/domain/device",
-                       bus, driver, de->d_name);
-               }
-               list->path = realpath(path, NULL);
                list->next = NULL;
+               list->path = p;
+
                if ((list->pci_id = strrchr(list->path, '/')) != NULL)
                        list->pci_id++;
        }
@@ -724,8 +733,10 @@ char *vmd_domain_to_controller(struct sys_dev *hba, char *buf)
                return NULL;
 
        dir = opendir("/sys/bus/pci/drivers/vmd");
+       if (!dir)
+               return NULL;
 
-       for (ent = dir ? readdir(dir) : NULL; ent; ent = readdir(dir)) {
+       for (ent = readdir(dir); ent; ent = readdir(dir)) {
                sprintf(path, "/sys/bus/pci/drivers/vmd/%s/domain/device",
                        ent->d_name);
 
@@ -734,8 +745,11 @@ char *vmd_domain_to_controller(struct sys_dev *hba, char *buf)
 
                if (strncmp(buf, hba->path, strlen(buf)) == 0) {
                        sprintf(path, "/sys/bus/pci/drivers/vmd/%s", ent->d_name);
+                       closedir(dir);
                        return realpath(path, buf);
                }
        }
+
+       closedir(dir);
        return NULL;
 }