diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-10-04 12:44:39 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-10-04 12:44:51 +0000 |
commit | 1f0ba77dded1b0070d9a9eb2b1349c4de2f5c848 (patch) | |
tree | e0a8b22cb4fdd4c3db88d315052932a9ad17290d | |
parent | Merging upstream version 1.6. (diff) | |
download | libnvme-1f0ba77dded1b0070d9a9eb2b1349c4de2f5c848.tar.xz libnvme-1f0ba77dded1b0070d9a9eb2b1349c4de2f5c848.zip |
Removing cherry-picked pci-slots-fd-leak.patch, included upstream.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r-- | debian/patches/series | 1 | ||||
-rw-r--r-- | debian/patches/upstream/0001-pci-slots-fd-leak.patch | 26 |
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; |