b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
29 lines
977 B
Diff
29 lines
977 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Tue, 2 Feb 2021 15:18:33 +0100
|
|
Subject: [PATCH] libmultipath: check return value of udev_device_get_devnum()
|
|
|
|
udev_device_get_devnum() may fail, in which case it returns
|
|
makedev(0, 0).
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/discovery.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
|
|
index 921025d4..15cf6413 100644
|
|
--- a/libmultipath/discovery.c
|
|
+++ b/libmultipath/discovery.c
|
|
@@ -1659,6 +1659,9 @@ common_sysfs_pathinfo (struct path * pp)
|
|
return PATHINFO_FAILED;
|
|
}
|
|
devt = udev_device_get_devnum(pp->udev);
|
|
+ if (major(devt) == 0 && minor(devt) == 0)
|
|
+ return PATHINFO_FAILED;
|
|
+
|
|
snprintf(pp->dev_t, BLK_DEV_SIZE, "%d:%d", major(devt), minor(devt));
|
|
|
|
condlog(4, "%s: dev_t = %s", pp->dev, pp->dev_t);
|