SOURCES/0138-libmultipath-foreign-fix-memory-leak-in-nvme-foreign.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Mon, 6 Jan 2025 19:57:53 -0500
-Subject: [PATCH] libmultipath/foreign: fix memory leak in nvme foreign handler
-
-_find_controllers() needs to free the udev device if it doesn't get
-added to a path.
-
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
----
- libmultipath/foreign/nvme.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libmultipath/foreign/nvme.c b/libmultipath/foreign/nvme.c
-index 5feb1e95..1d48b08d 100644
---- a/libmultipath/foreign/nvme.c
-+++ b/libmultipath/foreign/nvme.c
-@@ -697,6 +697,7 @@ static void _find_controllers(struct context *ctx, struct nvme_map *map)
- 		path = _find_path_by_syspath(map,
- 					     udev_device_get_syspath(udev));
- 		if (path != NULL) {
-+			udev_device_unref(udev);
- 			path->seen = true;
- 			condlog(4, "%s: %s already known",
- 				__func__, fn);
-@@ -704,8 +705,10 @@ static void _find_controllers(struct context *ctx, struct nvme_map *map)
- 		}
- 
- 		path = calloc(1, sizeof(*path));
--		if (path == NULL)
-+		if (path == NULL) {
-+			udev_device_unref(udev);
- 			continue;
-+		}
- 
- 		path->gen.ops = &nvme_path_ops;
- 		path->udev = udev;

SOURCES/0139-mpathpersist-Fix-REPORT-CAPABILITIES-output.patch

@@ -1,109 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Benjamin Marzinski <bmarzins@redhat.com>
-Date: Tue, 11 Nov 2025 15:52:53 -0500
-Subject: [PATCH] mpathpersist: Fix REPORT CAPABILITIES output
-
-mpathpersist was incorrectly parsing the REPORT CAPABILITES service
-action output. In reality, the type mask is two bytes where the type
-information is stored in bits 7, 6, 5, 3, & 1 (0xea) of the first byte
-and bit 0 (0x01) of the second byte. libmpathpersist was treating these
-two bytes as a big endian 16 bit number, but mpathpersist was looking
-for bits in that number as if it was little endian number.
-
-Ideally, libmpathpersist would treat prin_capdescr.pr_type_mask as
-two bytes, like it does for the flags. But we already expose this
-as a 16 bit number, where we treated the input bytes as a big endian
-number. There's no great reason to mess with the libmpathpersist API,
-when we can just make mpathpersist treat this data like libmpathpersist
-provides it. So, fix mpathpersist to print the data out correctly.
-
-Additionally, instead of printing a 1 or a 0 to indicate if a type was
-supported or not, it was printing the value of the type flag. Also,
-Persist Through Power Loss Capable (PTPL_C) was being reported if any
-bit in flags[0] was set. Fix these as well. Reformat all of the
-capability printing lines, since it is less confusing than only
-reformatting some of them.
-
-Fixes: ae4e8a6 ("mpathpersist: Add new utility for managing persistent reservation on dm multipath device")
-Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
-Reviewed-by: Martin Wilck <mwilck@suse.com>
----
- libmpathpersist/mpath_persist.h |  4 ++-
- mpathpersist/main.c             | 43 +++++++++++++++++++++++----------
- 2 files changed, 33 insertions(+), 14 deletions(-)
-
-diff --git a/libmpathpersist/mpath_persist.h b/libmpathpersist/mpath_persist.h
-index 0e4e0e53..3e2d81a0 100644
---- a/libmpathpersist/mpath_persist.h
-+++ b/libmpathpersist/mpath_persist.h
-@@ -112,7 +112,9 @@ struct prin_capdescr
- {
- 	uint16_t length;
- 	uint8_t  flags[2];
--	uint16_t pr_type_mask;
-+	uint16_t pr_type_mask; /* The two bytes of the type mask are treated
-+				  as a single big-endian number. So the valid
-+				  type bits are 0xea01 */
- 	uint16_t _reserved;
- };
- 
-diff --git a/mpathpersist/main.c b/mpathpersist/main.c
-index 28bfe410..ca5baf95 100644
---- a/mpathpersist/main.c
-+++ b/mpathpersist/main.c
-@@ -741,25 +741,42 @@ void mpath_print_buf_readcap( struct prin_resp *pr_buff)
- 
- 	printf("Report capabilities response:\n");
- 
--	printf("  Compatible Reservation Handling(CRH): %d\n", !!(pr_buff->prin_descriptor.prin_readcap.flags[0] & 0x10));
--	printf("  Specify Initiator Ports Capable(SIP_C): %d\n",!!(pr_buff->prin_descriptor.prin_readcap.flags[0] & 0x8));
--	printf("  All Target Ports Capable(ATP_C): %d\n",!!(pr_buff->prin_descriptor.prin_readcap.flags[0] & 0x4 ));
--	printf("  Persist Through Power Loss Capable(PTPL_C): %d\n",!!(pr_buff->prin_descriptor.prin_readcap.flags[0]));
--	printf("  Type Mask Valid(TMV): %d\n", !!(pr_buff->prin_descriptor.prin_readcap.flags[1] & 0x80));
--	printf("  Allow Commands: %d\n", !!(( pr_buff->prin_descriptor.prin_readcap.flags[1] >> 4) & 0x7));
-+	printf("  Compatible Reservation Handling(CRH): %d\n",
-+	       !!(pr_buff->prin_descriptor.prin_readcap.flags[0] & 0x10));
-+	printf("  Specify Initiator Ports Capable(SIP_C): %d\n",
-+	       !!(pr_buff->prin_descriptor.prin_readcap.flags[0] & 0x8));
-+	printf("  All Target Ports Capable(ATP_C): %d\n",
-+	       !!(pr_buff->prin_descriptor.prin_readcap.flags[0] & 0x4));
-+	printf("  Persist Through Power Loss Capable(PTPL_C): %d\n",
-+	       !!(pr_buff->prin_descriptor.prin_readcap.flags[0] & 0x1));
-+	printf("  Type Mask Valid(TMV): %d\n",
-+	       !!(pr_buff->prin_descriptor.prin_readcap.flags[1] & 0x80));
-+	printf("  Allow Commands: %d\n",
-+	       !!((pr_buff->prin_descriptor.prin_readcap.flags[1] >> 4) & 0x7));
- 	printf("  Persist Through Power Loss Active(PTPL_A): %d\n",
--			!!(pr_buff->prin_descriptor.prin_readcap.flags[1] & 0x1));
-+	       !!(pr_buff->prin_descriptor.prin_readcap.flags[1] & 0x1));
- 
- 	if(pr_buff->prin_descriptor.prin_readcap.flags[1] & 0x80)
- 	{
- 		printf("    Support indicated in Type mask:\n");
- 
--		printf("      %s: %d\n", pr_type_strs[7], pr_buff->prin_descriptor.prin_readcap.pr_type_mask & 0x80);
--		printf("      %s: %d\n", pr_type_strs[6], pr_buff->prin_descriptor.prin_readcap.pr_type_mask & 0x40);
--		printf("      %s: %d\n", pr_type_strs[5], pr_buff->prin_descriptor.prin_readcap.pr_type_mask & 0x20);
--		printf("      %s: %d\n", pr_type_strs[3], pr_buff->prin_descriptor.prin_readcap.pr_type_mask & 0x8);
--		printf("      %s: %d\n", pr_type_strs[1], pr_buff->prin_descriptor.prin_readcap.pr_type_mask & 0x2);
--		printf("      %s: %d\n", pr_type_strs[8], pr_buff->prin_descriptor.prin_readcap.pr_type_mask & 0x100);
-+		printf("      %s: %d\n", pr_type_strs[7],
-+		       !!(pr_buff->prin_descriptor.prin_readcap.pr_type_mask &
-+			  0x8000));
-+		printf("      %s: %d\n", pr_type_strs[6],
-+		       !!(pr_buff->prin_descriptor.prin_readcap.pr_type_mask &
-+			  0x4000));
-+		printf("      %s: %d\n", pr_type_strs[5],
-+		       !!(pr_buff->prin_descriptor.prin_readcap.pr_type_mask &
-+			  0x2000));
-+		printf("      %s: %d\n", pr_type_strs[3],
-+		       !!(pr_buff->prin_descriptor.prin_readcap.pr_type_mask &
-+			  0x800));
-+		printf("      %s: %d\n", pr_type_strs[1],
-+		       !!(pr_buff->prin_descriptor.prin_readcap.pr_type_mask &
-+			  0x200));
-+		printf("      %s: %d\n", pr_type_strs[8],
-+		       !!(pr_buff->prin_descriptor.prin_readcap.pr_type_mask & 0x1));
- 	}
- }
- 

SPECS/device-mapper-multipath.spec

@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.8.4
-Release: 43%{?dist}
+Release: 41%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -148,8 +148,6 @@ Patch00134: 0134-multipathd-handle-no-active-paths-in-update_map_pr.patch
 Patch00135: 0135-libmpathpersist-fix-resource-leak-in-update_map_pr.patch
 Patch00136: 0136-multipathd-Added-support-to-handle-FPIN-Li-events-fo.patch
 Patch00137: 0137-multipathd-Make-sure-to-disable-queueing-if-recovery.patch
-Patch00138: 0138-libmultipath-foreign-fix-memory-leak-in-nvme-foreign.patch
-Patch00139: 0139-mpathpersist-Fix-REPORT-CAPABILITIES-output.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -354,16 +352,6 @@ fi
 %{_pkgconfdir}/libdmmp.pc
 
 %changelog
-* Wed Nov 19 2025 Benjamin Marzinski <bmarzins@redhat.com> 0.8.4-43
-- Add 0139-mpathpersist-Fix-REPORT-CAPABILITIES-output.patch
-  * Fixes RHEL-126675 ("RHEL 8.10 mpathpersist -i --report-capabilities
-    -d returns the wrong results")
-- Resolves: RHEL-126675
-
-* Thu Jan  9 2025 Benjamin Marzinski <bmarzins@redhat.com> 0.8.4-42
-- Add 0138-libmultipath-foreign-fix-memory-leak-in-nvme-foreign.patch
-- Resolves: RHEL-72573
-
 * Fri Jan  5 2024 Benjamin Marzinski <bmarzins@redhat.com> 0.8.4-41
 - Add 0137-multipathd-Make-sure-to-disable-queueing-if-recovery.patch
 - Resolves: RHEL-16563