37dccf5dea
Add 0038-RHBZ-799860-netapp-config.patch
Add 0039-RH-detect-prio-fix.patch
* Don't autodetect ALUA prioritizer unless it actually can get a priority
Add 0040-RH-bindings-fix.patch
* Do a better job of trying to get the first free user_friendly_name
Add 0041-RH-check-for-erofs.patch
* Don't create/reload a device read-only unless doing it read/write fails
with EROFS
Remove 0017-RH-fix-sigusr1.patch
* fix signal handling upstream way instead
Add 0042-UP-fix-signal-handling.patch
* uxlsnr now handles all the signals sent to multipathd. This makes its
signal handling posix compliant, and harder to mess up.
Add 0043-RH-signal-waiter.patch
* ioctl isn't a pthread cancellation point. Send a signal to the waiter
thread to break out of waiting in ioctl for a dm event.
102 lines
2.5 KiB
Diff
102 lines
2.5 KiB
Diff
---
|
|
libmultipath/alias.c | 39 ++++++++++++++++++++++++++++++---------
|
|
1 file changed, 30 insertions(+), 9 deletions(-)
|
|
|
|
Index: multipath-tools-130222/libmultipath/alias.c
|
|
===================================================================
|
|
--- multipath-tools-130222.orig/libmultipath/alias.c
|
|
+++ multipath-tools-130222/libmultipath/alias.c
|
|
@@ -46,11 +46,11 @@ format_devname(char *name, int id, int l
|
|
memset(name,0, len);
|
|
strcpy(name, prefix);
|
|
for (pos = len - 1; pos >= prefix_len; pos--) {
|
|
+ id--;
|
|
name[pos] = 'a' + id % 26;
|
|
if (id < 26)
|
|
break;
|
|
id /= 26;
|
|
- id--;
|
|
}
|
|
memmove(name + prefix_len, name + pos, len - pos);
|
|
name[prefix_len + len - pos] = '\0';
|
|
@@ -66,13 +66,22 @@ scan_devname(char *alias, char *prefix)
|
|
if (!prefix || strncmp(alias, prefix, strlen(prefix)))
|
|
return -1;
|
|
|
|
+ if (strlen(alias) == strlen(prefix))
|
|
+ return -1;
|
|
+
|
|
+ if (strlen(alias) > strlen(prefix) + 7)
|
|
+ /* id of 'aaaaaaaa' overflows int */
|
|
+ return -1;
|
|
+
|
|
c = alias + strlen(prefix);
|
|
while (*c != '\0' && *c != ' ' && *c != '\t') {
|
|
+ if (*c < 'a' || *c > 'z')
|
|
+ return -1;
|
|
i = *c - 'a';
|
|
n = ( n * 26 ) + i;
|
|
+ if (n < 0)
|
|
+ return -1;
|
|
c++;
|
|
- if (*c < 'a' || *c > 'z')
|
|
- break;
|
|
n++;
|
|
}
|
|
|
|
@@ -84,7 +93,9 @@ lookup_binding(FILE *f, char *map_wwid,
|
|
{
|
|
char buf[LINE_MAX];
|
|
unsigned int line_nr = 0;
|
|
- int id = 0;
|
|
+ int id = 1;
|
|
+ int biggest_id = 1;
|
|
+ int smallest_bigger_id = INT_MAX;
|
|
|
|
*map_alias = NULL;
|
|
|
|
@@ -100,8 +111,12 @@ lookup_binding(FILE *f, char *map_wwid,
|
|
if (!alias) /* blank line */
|
|
continue;
|
|
curr_id = scan_devname(alias, prefix);
|
|
- if (curr_id >= id)
|
|
- id = curr_id + 1;
|
|
+ if (curr_id == id)
|
|
+ id++;
|
|
+ if (curr_id > biggest_id)
|
|
+ biggest_id = curr_id;
|
|
+ if (curr_id > id && curr_id < smallest_bigger_id)
|
|
+ smallest_bigger_id = curr_id;
|
|
wwid = strtok(NULL, " \t");
|
|
if (!wwid){
|
|
condlog(3,
|
|
@@ -116,11 +131,17 @@ lookup_binding(FILE *f, char *map_wwid,
|
|
if (*map_alias == NULL)
|
|
condlog(0, "Cannot copy alias from bindings "
|
|
"file : %s", strerror(errno));
|
|
- return id;
|
|
+ return 0;
|
|
}
|
|
}
|
|
condlog(3, "No matching wwid [%s] in bindings file.", map_wwid);
|
|
- return id;
|
|
+ if (id < 0) {
|
|
+ condlog(0, "no more available user_friendly_names");
|
|
+ return 0;
|
|
+ }
|
|
+ if (id < smallest_bigger_id)
|
|
+ return id;
|
|
+ return biggest_id + 1;
|
|
}
|
|
|
|
static int
|
|
@@ -254,7 +275,7 @@ get_user_friendly_alias(char *wwid, char
|
|
return NULL;
|
|
}
|
|
|
|
- if (!alias && can_write && !bindings_read_only)
|
|
+ if (!alias && can_write && !bindings_read_only && id)
|
|
alias = allocate_binding(fd, wwid, id, prefix);
|
|
|
|
fclose(f);
|