9abdc502cf
Rebased on top of additional commits staged for upstream * Previous patches 0048-0060 are now patches 0053-0054 & 0059-0069 Add 0048-libmultipath-add-device-to-hwtable.c.patch Add 0049-master-libmultipath-fix-use-after-free-when-iscsi-lo.patch Add 0050-libmultipath-warn-if-freeing-path-that-holds-mpp-hwe.patch Add 0051-libmultipath-warn-about-NULL-value-of-mpp-hwe.patch Add 0052-libmultipath-fix-mpp-hwe-handling-in-sync_paths.patch Add 0055-libmultipath-remove-code-duplication-in-path-countin.patch Add 0056-libmultipath-count-pending-paths-as-active-on-loads.patch Add 0057-libmultipath-deal-with-flushing-no-maps.patch Add 0058-multipath-deal-with-delegation-failures-correctly.patch Add 0070-multipath-add-libmpathvalid-library.patch * adds the libmpathvalid.so library to determine if devices are valid multipath paths. Add 0071-libmultipath-add-uid-failback-for-dasd-devices.patch Add 0072-libmultipath-add-ignore_udev_uid-option.patch
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Mon, 13 Jul 2020 13:07:42 +0200
|
|
Subject: [PATCH] libmultipath: warn about NULL value of mpp->hwe
|
|
|
|
mpp->hwe is only accessed in propsel.c. It may become unset if
|
|
all paths of the mpp have been deleted. Access to mpp->hwe in this
|
|
case should be avoided.
|
|
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/propsel.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
|
|
index d362beb4..68228272 100644
|
|
--- a/libmultipath/propsel.c
|
|
+++ b/libmultipath/propsel.c
|
|
@@ -65,7 +65,9 @@ do { \
|
|
__do_set_from_vec(struct hwentry, var, (src)->hwe, dest)
|
|
|
|
#define do_set_from_hwe(var, src, dest, msg) \
|
|
- if (__do_set_from_hwe(var, src, dest)) { \
|
|
+ if (!src->hwe) { \
|
|
+ condlog(0, "BUG: do_set_from_hwe called with hwe == NULL"); \
|
|
+ } else if (__do_set_from_hwe(var, src, dest)) { \
|
|
origin = msg; \
|
|
goto out; \
|
|
}
|
|
--
|
|
2.17.2
|
|
|