695f9436f4
Add 0035-libmpathpersist-fix-memory-leak-in-mpath_prout_rel.patch
Add 0036-libmpathpersist-retry-commands-on-other-paths-in-mpa.patch
Add 0037-libmpathpersist-check-released-key-against-the-reser.patch
Add 0038-multipathd-remove-thread-from-mpath_pr_event_handle.patch
Add 0039-libmpathpersist-remove-uneeded-wrapper-function.patch
Add 0040-libmpathpersist-reduce-log-level-for-persistent-rese.patch
Add 0041-libmpathpersist-remove-pointless-update_map_pr-ret-v.patch
Add 0042-multipathd-use-update_map_pr-in-mpath_pr_event_handl.patch
Add 0043-libmpathpersist-limit-changing-prflag-in-update_map_.patch
Add 0044-multipathd-Don-t-call-update_map_pr-unnecessarily.patch
Add 0045-libmpathpersist-remove-useless-function-send_prout_a.patch
Add 0046-libmpathpersist-redesign-failed-release-workaround.patch
Add 0047-libmpathpersist-fail-the-release-if-all-threads-fail.patch
Add 0048-libmpathpersist-Handle-changing-key-corner-case.patch
Add 0049-libmpathpersist-Handle-REGISTER-AND-IGNORE-changing-.patch
Add 0050-libmultipath-rename-prflag_value-enums.patch
Add 0051-libmpathpersist-use-a-switch-statement-for-prout-com.patch
Add 0052-libmpathpersist-Add-safety-check-for-preempting-on-k.patch
Add 0053-libmpathpersist-remove-update_map_pr-code-for-NULL-p.patch
Add 0054-libmpathpersist-move-update_map_pr-to-multipathd.patch
Add 0055-multipathd-clean-up-update_map_pr-and-mpath_pr_event.patch
Add 0056-libmpathpersist-clean-up-duplicate-function-declarat.patch
Add 0057-multipathd-wrap-setting-and-unsetting-prflag.patch
Add 0058-multipathd-unregister-PR-key-when-path-is-restored-i.patch
Add 0059-libmpathpersist-Fix-up-reservation_key-checking.patch
Add 0060-libmpathpersist-change-how-reservation-conflicts-are.patch
Add 0061-libmpathpersist-Clear-prkey-in-multipathd-before-unr.patch
Add 0062-libmpathpersist-only-clear-the-key-if-we-are-using-t.patch
Add 0063-libmpathpersist-Restore-old-reservation-key-on-failu.patch
Add 0064-libmpathpersist-update-reservation-key-before-checki.patch
Add 0065-libmpathpersist-retry-on-conflicts-in-mpath_prout_co.patch
Add 0066-libmpathpersist-Don-t-always-fail-registrations-for-.patch
Add 0067-libmpathpersist-Don-t-try-release-workaround-for-inv.patch
Add 0068-libmpathpersist-Don-t-fail-RESERVE-commands-unnecess.patch
Add 0069-libmpathpersist-reregister-keys-when-self-preempting.patch
Add 0070-libmpathpersist-handle-updating-key-race-condition.patch
Add 0071-libmpathpersist-handle-preempting-all-registrants-re.patch
Add 0072-libmpathpersist-Fix-REGISTER-AND-IGNORE-while-holdin.patch
Add 0073-libmpathpersist-Handle-RESERVE-with-reservation-held.patch
Add 0074-libmpathpersist-use-check_holding_reservation-in-mpa.patch
Add 0075-libmpathpersist-Fix-unregistering-while-holding-the-.patch
Add 0076-libmpathpersist-Fix-race-between-restoring-a-path-an.patch
Add 0077-multipathd-Fix-tracking-of-old-PR-key.patch
* Fixes RHEL-118720 ("There are many bugs in multipath's persistent
reservation handling [rhel-10]")
Resolves: RHEL-118720
74 lines
3.1 KiB
Diff
74 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Thu, 18 Sep 2025 18:12:07 -0400
|
|
Subject: [PATCH] libmpathpersist: Fix REGISTER AND IGNORE while holding a
|
|
reservation
|
|
|
|
If a device that is holding a reservation changes its registered key,
|
|
but the path holding the reservation is unavailable, libmpathpersist
|
|
must preempt the old key to update the reservation. If the key is
|
|
changed using REGISTER AND IGNORE, set_ignored_key() determines the old
|
|
key to preempt. Unfortunately, commit 165427dda broke it, by comparing
|
|
the wrong key against the actual reservation key. Then commit cf0eea85
|
|
broke it more, by using mpp->reservation_key after it had been updated,
|
|
so it was no longer the old key. Fix this by correctly comparing the old
|
|
key against the actual reservation key.
|
|
|
|
Fixes: 165427dda ("libmpathpersist: Add safety check for preempting on key change")
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmpathpersist/mpath_persist_int.c | 13 +++++++------
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/libmpathpersist/mpath_persist_int.c b/libmpathpersist/mpath_persist_int.c
|
|
index 87d7cb6b..e3514137 100644
|
|
--- a/libmpathpersist/mpath_persist_int.c
|
|
+++ b/libmpathpersist/mpath_persist_int.c
|
|
@@ -801,16 +801,17 @@ static int reservation_key_matches(struct multipath *mpp, uint8_t *key, int nois
|
|
* currently registered key for use in preempt_missing_path(), but only if
|
|
* the key is holding the reservation.
|
|
*/
|
|
-static void set_ignored_key(struct multipath *mpp, uint8_t *key)
|
|
+static void set_ignored_key(struct multipath *mpp, uint8_t *curr_key,
|
|
+ uint8_t *key)
|
|
{
|
|
memset(key, 0, 8);
|
|
- if (!get_be64(mpp->reservation_key))
|
|
+ if (memcmp(curr_key, key, 8) == 0)
|
|
return;
|
|
if (get_prhold(mpp->alias) == PR_UNSET)
|
|
return;
|
|
- if (reservation_key_matches(mpp, key, 0) == YNU_NO)
|
|
+ if (reservation_key_matches(mpp, curr_key, 0) == YNU_NO)
|
|
return;
|
|
- memcpy(key, &mpp->reservation_key, 8);
|
|
+ memcpy(key, curr_key, 8);
|
|
}
|
|
|
|
int do_mpath_persistent_reserve_out(vector curmp, vector pathvec, int fd,
|
|
@@ -834,6 +835,7 @@ int do_mpath_persistent_reserve_out(vector curmp, vector pathvec, int fd,
|
|
select_reservation_key(conf, mpp);
|
|
put_multipath_config(conf);
|
|
|
|
+ memcpy(&oldkey, &mpp->reservation_key, 8);
|
|
unregistering = (memcmp(&zerokey, paramp->sa_key, 8) == 0);
|
|
if (mpp->prkey_source == PRKEY_SOURCE_FILE &&
|
|
(rq_servact == MPATH_PROUT_REG_IGN_SA ||
|
|
@@ -842,7 +844,6 @@ int do_mpath_persistent_reserve_out(vector curmp, vector pathvec, int fd,
|
|
memcmp(paramp->key, &zerokey, 8) == 0 ||
|
|
memcmp(paramp->key, &mpp->reservation_key, 8) == 0)))) {
|
|
updated_prkey = true;
|
|
- memcpy(&oldkey, &mpp->reservation_key, 8);
|
|
memcpy(&mpp->reservation_key, paramp->sa_key, 8);
|
|
if (update_prkey_flags(alias, get_be64(mpp->reservation_key),
|
|
paramp->sa_flags)) {
|
|
@@ -910,7 +911,7 @@ int do_mpath_persistent_reserve_out(vector curmp, vector pathvec, int fd,
|
|
put_multipath_config(conf);
|
|
|
|
if (rq_servact == MPATH_PROUT_REG_IGN_SA)
|
|
- set_ignored_key(mpp, paramp->key);
|
|
+ set_ignored_key(mpp, (uint8_t *)&oldkey, paramp->key);
|
|
|
|
switch(rq_servact)
|
|
{
|