summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-12-24 07:54:07 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-12-24 07:54:49 +0000
commitc43d3179b85b3b234d6846882b3651080c08d5f3 (patch)
treebdff70bcfae5ab9392088c67b2efa77af9e46506
parentRemoving python location workaround, now not needed anymore. (diff)
downloadlibnvme-c43d3179b85b3b234d6846882b3651080c08d5f3.tar.xz
libnvme-c43d3179b85b3b234d6846882b3651080c08d5f3.zip
Removing pci-slots-fd-leak.patch, included upstream.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/upstream/0001-pci-slots-fd-leak.patch26
2 files changed, 0 insertions, 27 deletions
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 <martin.belanger@dell.com>
-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;