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
987 B
Diff
29 lines
987 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Wed, 24 Mar 2021 14:15:02 -0500
|
|
Subject: [PATCH] libmultipath: avoid infinite loop with bad vpd page 83
|
|
identifier
|
|
|
|
If a device with a scsi name identifier has an unknown prefix,
|
|
parse_vpd_pg83() needs to advance to the next identifier, instead of
|
|
simply trying the same one again in an infinite loop.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/discovery.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
|
|
index f216a724..5727f7a6 100644
|
|
--- a/libmultipath/discovery.c
|
|
+++ b/libmultipath/discovery.c
|
|
@@ -1157,7 +1157,7 @@ parse_vpd_pg83(const unsigned char *in, size_t in_len,
|
|
if (memcmp(d + 4, "eui.", 4) &&
|
|
memcmp(d + 4, "naa.", 4) &&
|
|
memcmp(d + 4, "iqn.", 4))
|
|
- continue;
|
|
+ break;
|
|
if (prio < 4) {
|
|
prio = 4;
|
|
vpd = d;
|