From c20fe373b10485db3ea490d0b35617ab6698037c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 16 Feb 2025 10:13:02 +0100 Subject: [PATCH] Removing cherry-picked pci-slots-fd-leak.patch, included upstream. Signed-off-by: Daniel Baumann --- debian/patches/series | 1 - .../upstream/0001-pci-slots-fd-leak.patch | 26 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 debian/patches/series delete mode 100644 debian/patches/upstream/0001-pci-slots-fd-leak.patch diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 08dea8e..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -upstream/0001-pci-slots-fd-leak.patch diff --git a/debian/patches/upstream/0001-pci-slots-fd-leak.patch b/debian/patches/upstream/0001-pci-slots-fd-leak.patch deleted file mode 100644 index e3a5b15..0000000 --- a/debian/patches/upstream/0001-pci-slots-fd-leak.patch +++ /dev/null @@ -1,26 +0,0 @@ -Author: Martin Belanger -Description: 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. - -diff -Naurp libnvme.orig/src/nvme/tree.c libnvme/src/nvme/tree.c ---- libnvme.orig/src/nvme/tree.c -+++ libnvme/src/nvme/tree.c -@@ -1292,6 +1292,8 @@ static char *nvme_ctrl_lookup_phy_slot(n - 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(n - } - } - free(target_addr); -+ closedir(slots_dir); - if (found) - return strdup(entry->d_name); - return NULL;