gentoo auto-resync : 24:09:2023 - 23:23:49

4 files changed, 40 insertions, 1 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 5a1100e50ab0..08c23a10842c 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libnvme/Manifest b/sys-libs/libnvme/Manifest
index bba44da9b3bc..faf716787dbd 100644
--- a/sys-libs/libnvme/Manifest
+++ b/sys-libs/libnvme/Manifest
@@ -1,4 +1,5 @@
 AUX libnvme-1.3-configure-clang-16.patch 1332 BLAKE2B 701a941236c5fd644722086d58d7b5ce15d81f8cdc17ea4d2cb79efd743acf54990da83c81c8a8ef74822b3d1e51e70eb02a4a25a07a74404a307d564f56dc37 SHA512 a100ab3232b0a1bee74dbe0d4893d3819c4e3f4b741da740240431cabf72c4ccb411fca6a19f44ecf5e64bdbfd2f470b4c436c57b1a573dfea14e575a3dbd44f
+AUX libnvme-1.5-free-segfault.patch 1190 BLAKE2B ba2eb2116fcf5735b4bf91f6a9c8c16fe874daf37e4845caa13ac75023587acf53c7eb7874c4592f2de81b5ddc19902b10198c77e099dc4688e362c5b8798384 SHA512 fec31628bd78404ed8b10d66857bf4f6442d1b052342827ede58677ce33e9b9aff6e8c74d14bd5d1a91928ae5ef7b2af5fb3378e531ca580a1045f18b21a3bcf
 DIST libnvme-1.2.tar.gz 484397 BLAKE2B ae6b1c3aa8f45594219470059cfc8982674433772f89faab1659811d860036f8af89bbcb383db37e96b763188935d2c1ecaa5176b8140bba50f8ea226e989a06 SHA512 f50517838cd1df3cdd123afdb67870633e9e484bf84dba70b784d7e86ecb355b96ba9d6a1cffb96b35444da7870dfe21c54b69701b5fe5b515319280db4a84e4
 DIST libnvme-1.3.tar.gz 499870 BLAKE2B 5a019c12829890a0fe0b5e6aec5fbd009fc3bd6dfe7e81f61731292f4ea8b03044e7625491479350c399cc8cd5bc023e02cc9e93f1eba38f4c747667e84cfb24 SHA512 c874b29b73e55be842f71e74a226a76fcd50dfa72e2be100f0437bc83e740cd146b6d2f2cdaa940c11c3d8c48ff2c065ac0e8a83d4d0dde743edf4179f328670
 DIST libnvme-1.4.tar.gz 506101 BLAKE2B c1496c6258bf20ed4109710b06671fa7f0e27c7649520ad8ccf4021df00fffc45f80fea248d62d2b85eecc8b15b6afaf4a113d96d6737ae6772346c9d0bc1002 SHA512 cc4a0a78083471e912736d76e4faaa5c285e1149029560f212ff06254863e8f21b48fcb1638599bd68efcf888312a248fb748d23776af03574b39fbd9b2a418d
@@ -6,5 +7,5 @@ DIST libnvme-1.5.tar.gz 566715 BLAKE2B 2111a6929bc17949f03c39fdb247420bba371641b
 EBUILD libnvme-1.2-r1.ebuild 1192 BLAKE2B dd05f5d1fba9e50117b24d66fea37d05d1a9d1f900206e419f3f3ce76e3f0868639aa2aadf597507767f726fa5c59376e9d51d6bcd1067d62e24b12069e1baae SHA512 b56d7690c6b71d75b27436d36a0f47dee76b8c3951374aaf58cf4794b687b6fa02b2dbe5936c8fa76390a65c1463842ad2290d4fb4b37f3601644705c3d49971
 EBUILD libnvme-1.3-r1.ebuild 1351 BLAKE2B 571a22422960fd0a7f5c2a0e16e367cb5b9ad9fcd543698b7aa4f320d24c5bb7cb4918bd858d9ebd144e24ec15e4c4db0a546aa773bb4ed023539314b01da3ed SHA512 223e511a5699cdef31b1a22d7bdd1bf757442b652f3dcead4a08e481524f963eb243f70cafa732165783bb32a7ad2d33baf1f379e9c18252f338943c472096dc
 EBUILD libnvme-1.4.ebuild 1393 BLAKE2B 4d67d8f1c72859697e1983a609f3b55aaa62c4cd7bb8428318ae46a137fbddcb5afb46646d0b297807faea32e66fa545cff2d0d229f3b4de61b8480f1891a436 SHA512 01d338434a5bddaa21ca9d69ec362152252359660a0eb8ca16ae27b0f96389ae15c2cc78ba3eb1780deb9092e5d5fb514bafe74ab7122efe2a441fa1ad4a8877
-EBUILD libnvme-1.5-r1.ebuild 1426 BLAKE2B 07f5daf3a131e6f8675a508c214e5226b9313c47dcb1d83958e5bf81f21df4f29fcfc58eccf5ddeec09f8cde4369bb64f0476e298833f28b6bb9d2656e8ad74f SHA512 61d74893546adeccf57072ed3731bf5e96beabfdefbfc0d03dc970a5cbeb24a47b3f7579d607d26d772a1efc9d969ef67bee877d7eb827c115a821170b7da8db
+EBUILD libnvme-1.5-r2.ebuild 1478 BLAKE2B e6a6bb6bf55a5f7d5d540b71ca43ce51a5b2b89a1e0ef79f16365551aa28b434637d4049cc1c3c18e8fff68d179b26c0859d6e50fc13e1e064fbff81a39e78d8 SHA512 cf83edd0bf4c928dc8bb42d1b38c153c9a528a6c92bf87d2dfd8e427cacca1796ae6515fdf2ca6313602d92cc37f667f761435f01c3d888ea60da7ff28659e59
 MISC metadata.xml 585 BLAKE2B 6163419190adb903fdbdef99ad53f8b14ffbc08ac3c8b56f820049468010af2a58ac204ded1b53c767759e9ac864bf85dbc3b723cd7113cb919194dd9ceaaac3 SHA512 2f5268b41676d2a61d5415de3ec62149cda53613970a1af6aface937cc635d26866c88205a6d9fcf7efd7df0c7f45308ecf5b29b6cea937966b765a222edb8f7
diff --git a/sys-libs/libnvme/files/libnvme-1.5-free-segfault.patch b/sys-libs/libnvme/files/libnvme-1.5-free-segfault.patch
new file mode 100644
index 000000000000..a41cf380f911
--- /dev/null
+++ b/sys-libs/libnvme/files/libnvme-1.5-free-segfault.patch
@@ -0,0 +1,36 @@
+From c56910f807795528fff7ba6b81f8efcdb4babe98 Mon Sep 17 00:00:00 2001
+From: Martin Belanger <martin.belanger@dell.com>
+Date: Wed, 5 Jul 2023 10:59:25 -0400
+Subject: [PATCH] tree: missing closedir() causes fd leak for
+ "/sys/bus/pci/slots"
+
+In nvme_ctrl_lookup_phy_slot(), we are missing a closedir(), which
+causes file descriptors to leak. Also, there was a missing free()
+when the function returns with ENOMEM.
+
+Signed-off-by: Martin Belanger <martin.belanger@dell.com>
+---
+ src/nvme/tree.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/nvme/tree.c b/src/nvme/tree.c
+index a2ac0698..805eff99 100644
+--- a/src/nvme/tree.c
++++ b/src/nvme/tree.c
+@@ -1292,6 +1292,8 @@ static char *nvme_ctrl_lookup_phy_slot(nvme_root_t r, const char *address)
+ 			ret = asprintf(&path, "/sys/bus/pci/slots/%s", entry->d_name);
+ 			if (ret < 0) {
+ 				errno = ENOMEM;
++				free(target_addr);
++				closedir(slots_dir);
+ 				return NULL;
+ 			}
+ 			addr = nvme_get_attr(path, "address");
+@@ -1306,6 +1308,7 @@ static char *nvme_ctrl_lookup_phy_slot(nvme_root_t r, const char *address)
+ 		}
+ 	}
+ 	free(target_addr);
++	closedir(slots_dir);
+ 	if (found)
+ 		return strdup(entry->d_name);
+ 	return NULL;
diff --git a/sys-libs/libnvme/libnvme-1.5-r1.ebuild b/sys-libs/libnvme/libnvme-1.5-r2.ebuild
index 5173e9bdabf1..9e2be0abd195 100644
--- a/sys-libs/libnvme/libnvme-1.5-r1.ebuild
+++ b/sys-libs/libnvme/libnvme-1.5-r2.ebuild
@@ -32,6 +32,8 @@ BDEPEND="
 	dev-lang/swig
 "
 
+PATCHES=( "${FILESDIR}/${P}-free-segfault.patch" )
+
 src_configure() {
 	local emesonargs=(
 		-Dpython=false