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
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Fri, 12 Feb 2021 00:41:55 +0100
|
|
Subject: [PATCH] libmultipath: fix compilation error with gcc 10 on i386
|
|
|
|
gcc complained about a possible negative value of "nr" in the
|
|
memcpy() call. I consider that a false positive, but it's easily
|
|
fixed.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/sysfs.c | 29 ++++++++++++++---------------
|
|
1 file changed, 14 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/libmultipath/sysfs.c b/libmultipath/sysfs.c
|
|
index 5390de62..7a2af1ea 100644
|
|
--- a/libmultipath/sysfs.c
|
|
+++ b/libmultipath/sysfs.c
|
|
@@ -344,24 +344,23 @@ bool sysfs_is_multipathed(struct path *pp, bool set_wwid)
|
|
pthread_cleanup_push(close_fd, (void *)fd);
|
|
nr = read(fd, uuid, sizeof(uuid));
|
|
if (nr > (int)UUID_PREFIX_LEN &&
|
|
- !memcmp(uuid, UUID_PREFIX, UUID_PREFIX_LEN))
|
|
+ !memcmp(uuid, UUID_PREFIX, UUID_PREFIX_LEN)) {
|
|
found = true;
|
|
- else if (nr < 0) {
|
|
+ if (set_wwid) {
|
|
+ nr -= UUID_PREFIX_LEN;
|
|
+ memcpy(pp->wwid, uuid + UUID_PREFIX_LEN, nr);
|
|
+ if (nr == WWID_SIZE) {
|
|
+ condlog(4, "%s: overflow while reading from %s",
|
|
+ __func__, pathbuf);
|
|
+ pp->wwid[0] = '\0';
|
|
+ } else {
|
|
+ pp->wwid[nr] = '\0';
|
|
+ strchop(pp->wwid);
|
|
+ }
|
|
+ }
|
|
+ } else if (nr < 0)
|
|
condlog(1, "%s: error reading from %s: %m",
|
|
__func__, pathbuf);
|
|
- }
|
|
- if (found && set_wwid) {
|
|
- nr -= UUID_PREFIX_LEN;
|
|
- memcpy(pp->wwid, uuid + UUID_PREFIX_LEN, nr);
|
|
- if (nr == WWID_SIZE) {
|
|
- condlog(4, "%s: overflow while reading from %s",
|
|
- __func__, pathbuf);
|
|
- pp->wwid[0] = '\0';
|
|
- } else {
|
|
- pp->wwid[nr] = '\0';
|
|
- strchop(pp->wwid);
|
|
- }
|
|
- }
|
|
|
|
pthread_cleanup_pop(1);
|
|
}
|