9fdf79cddf
Update Source to upstream version 0.8.5 plus post tag commits
* Patches 0001-0121 are from
https://github.com/openSUSE/multipath-tools/tree/queue and are
already queued for upstream
* Patches 0122&0123 have been posted for upstream inclusion
Rename files
* Previous patches 0103-0111 are now patches 0124-0132
32 lines
864 B
Diff
32 lines
864 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Mon, 1 Feb 2021 13:10:46 +0100
|
|
Subject: [PATCH] multipathd: ev_add_path: fail if add_map_with_path() fails
|
|
|
|
If start_waiter was set before and the "rescan" label was used,
|
|
we may try to set up an empty/invalid map.
|
|
Always fail if add_map_with_path() isn't successful.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 43d77688..425492a9 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -1028,7 +1028,7 @@ rescan:
|
|
*/
|
|
start_waiter = 1;
|
|
}
|
|
- if (!start_waiter)
|
|
+ else
|
|
goto fail; /* leave path added to pathvec */
|
|
}
|
|
|
|
--
|
|
2.17.2
|
|
|