|
 |
31f061 |
From b3719266bd5e3a9e6737d6bda60e543121ddf343 Mon Sep 17 00:00:00 2001
|
|
|
31f061 |
From: David Teigland <teigland@redhat.com>
|
|
|
31f061 |
Date: Tue, 9 Feb 2021 09:47:08 -0600
|
|
|
31f061 |
Subject: [PATCH] dev_get_primary_dev: fix invalid path check
|
|
|
31f061 |
|
|
|
31f061 |
Fix commit bee9f4efdd81 "filter-mpath: work with nvme devices"
|
|
|
31f061 |
which removed setting the path for readlink.
|
|
|
31f061 |
|
|
|
31f061 |
(cherry picked from commit f74f94c2ddb1d33d75d325c959344a566a621fd5)
|
|
|
31f061 |
|
|
|
31f061 |
Conflicts:
|
|
|
31f061 |
lib/device/dev-type.c
|
|
|
31f061 |
---
|
|
|
31f061 |
lib/device/dev-type.c | 11 ++++++++---
|
|
|
31f061 |
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
31f061 |
|
|
|
31f061 |
diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
|
|
|
31f061 |
index 379afa8..1342e97 100644
|
|
|
31f061 |
--- a/lib/device/dev-type.c
|
|
|
31f061 |
+++ b/lib/device/dev-type.c
|
|
|
31f061 |
@@ -434,7 +434,7 @@ static int _has_sys_partition(struct device *dev)
|
|
|
31f061 |
int minor = (int) MINOR(dev->dev);
|
|
|
31f061 |
|
|
|
31f061 |
/* check if dev is a partition */
|
|
|
31f061 |
- if (dm_snprintf(path, sizeof(path), "%s/dev/block/%d:%d/partition",
|
|
|
31f061 |
+ if (dm_snprintf(path, sizeof(path), "%sdev/block/%d:%d/partition",
|
|
|
31f061 |
dm_sysfs_dir(), major, minor) < 0) {
|
|
|
31f061 |
log_error("dm_snprintf partition failed");
|
|
|
31f061 |
return 0;
|
|
|
31f061 |
@@ -660,8 +660,13 @@ int dev_get_primary_dev(struct dev_types *dt, struct device *dev, dev_t *result)
|
|
|
31f061 |
* - basename ../../block/md0/md0 = md0
|
|
|
31f061 |
* Parent's 'dev' sysfs attribute = /sys/block/md0/dev
|
|
|
31f061 |
*/
|
|
|
31f061 |
- if ((size = readlink(dirname(path), temp_path, sizeof(temp_path) - 1)) < 0) {
|
|
|
31f061 |
- log_sys_error("readlink", path);
|
|
|
31f061 |
+ if (dm_snprintf(path, sizeof(path), "%sdev/block/%d:%d",
|
|
|
31f061 |
+ dm_sysfs_dir(), major, minor) < 0) {
|
|
|
31f061 |
+ log_warn("WARNING: %s: major:minor sysfs path is too long.", dev_name(dev));
|
|
|
31f061 |
+ return 0;
|
|
|
31f061 |
+ }
|
|
|
31f061 |
+ if ((size = readlink(path, temp_path, sizeof(temp_path) - 1)) < 0) {
|
|
|
31f061 |
+ log_warn("WARNING: Readlink of %s failed.", path);
|
|
|
31f061 |
goto out;
|
|
|
31f061 |
}
|
|
|
31f061 |
|
|
|
31f061 |
--
|
|
|
31f061 |
1.8.3.1
|
|
|
31f061 |
|