64b1cb0e21
Update Source to 0.7.7
* Previous patches 0001-0009 & 0018 are included in this commit
Add upstream patches since 0.7.7
* patches 0001-0012 are from upstream commits since 0.7.7
Add 0015-mpathpersist-add-all_tg_pt-option.patch
* add new all_tg_pt multpiath.conf option. posted upstream
Add 0016-libmultipath-remove-rbd-code.patch
* remove unused rbd code. posted upstream
Add 0017-mpathpersist-fix-aptpl-support.patch
* add ":aptpl" suffix for reservation_key to fix aptpl support.
posted upstream
Add 0018-multipath-don-t-check-timestamps-without-a-path.patch
* fix multipath null dereference crash. posted upstream
Add 0019-libmultipath-fix-detect-alua-corner-case.patch
* fix alua detection with retain_hardware_handler set to off. posted
upstream
Add 0020-multipath-fix-setting-conf-version.patch
* multipath wasn't setting the kernel version correctly. posted
upstream
Add 0028-RH-reset-default-find_mutipaths-value-to-off.patch
* default to RHEL7 and older device detection style. Redhat specific,
to keep customer experience the same.
Rename files
* Previous patches 0010-0011 are now patches 0013-0014
* Previous patches 0012-0017 & 0019 are now patches 0021-0027
Modify 0021-RH-fixup-udev-rules-for-redhat.patch
* Fix spurious compile warning with redhat compile options
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Tue, 5 Jun 2018 15:31:55 -0500
|
|
Subject: [PATCH] multipath: don't check timestamps without a path
|
|
|
|
If a path was blacklisted, pathvec could exist but have no path in it.
|
|
print_cmd_valid wasn't checking this before calling
|
|
find_multipaths_check_timeout(). This was causing it to dereference a
|
|
NULL pointer in these cases.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipath/main.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/multipath/main.c b/multipath/main.c
|
|
index c69e996..3f0a6aa 100644
|
|
--- a/multipath/main.c
|
|
+++ b/multipath/main.c
|
|
@@ -482,10 +482,8 @@ static int print_cmd_valid(int k, const vector pathvec,
|
|
pp, pp->find_multipaths_timeout, &until);
|
|
if (wait != FIND_MULTIPATHS_WAITING)
|
|
k = 1;
|
|
- } else if (pathvec != NULL) {
|
|
- pp = VECTOR_SLOT(pathvec, 0);
|
|
+ } else if (pathvec != NULL && (pp = VECTOR_SLOT(pathvec, 0)))
|
|
wait = find_multipaths_check_timeout(pp, 0, &until);
|
|
- }
|
|
if (wait == FIND_MULTIPATHS_WAITING)
|
|
printf("FIND_MULTIPATHS_WAIT_UNTIL=\"%ld.%06ld\"\n",
|
|
until.tv_sec, until.tv_nsec/1000);
|
|
--
|
|
2.7.4
|
|
|