commit: d1288e2fe17adb3dacd2ab3f1b415c4ed45136d4 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Sun Sep 24 19:53:27 2023 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Sun Sep 24 19:55:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1288e2f
sys-libs/libnvme: revbump 1.5, add fdleak segfault free patch This prevents udisks from crashing and holding or freezing up desktop sessions. Issue: https://github.com/linux-nvme/libnvme/issues/684 Issue: https://github.com/storaged-project/udisks/issues/1152 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> .../libnvme/files/libnvme-1.5-free-segfault.patch | 36 ++++++++++++++++++++++ ...libnvme-1.5-r1.ebuild => libnvme-1.5-r2.ebuild} | 2 ++ 2 files changed, 38 insertions(+) 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.belan...@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.belan...@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 similarity index 96% rename from sys-libs/libnvme/libnvme-1.5-r1.ebuild rename to 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
