|
 |
d5e699 |
From 686536a2862f0d69e0075316ef54c1f927d134a3 Mon Sep 17 00:00:00 2001
|
|
|
d5e699 |
From: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
|
|
d5e699 |
Date: Fri, 1 Nov 2019 16:04:02 +0100
|
|
|
d5e699 |
Subject: [PATCH 03/10] Linux backend: fix ressource leak
|
|
|
d5e699 |
|
|
|
d5e699 |
Issue detected by Coverity:
|
|
|
d5e699 |
22. leaked_handle: Handle variable fd going out of scope leaks the handle.
|
|
|
d5e699 |
|
|
|
d5e699 |
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
|
|
|
d5e699 |
(cherry picked from commit 1bb774ca7e5cb100e1fb7ac287e561b2155da70e)
|
|
|
d5e699 |
---
|
|
|
d5e699 |
libusb/os/linux_usbfs.c | 4 ++++
|
|
|
d5e699 |
libusb/version_nano.h | 2 +-
|
|
|
d5e699 |
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
d5e699 |
|
|
|
d5e699 |
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
|
|
|
d5e699 |
index 63fe592..dace935 100644
|
|
|
d5e699 |
--- a/libusb/os/linux_usbfs.c
|
|
|
d5e699 |
+++ b/libusb/os/linux_usbfs.c
|
|
|
d5e699 |
@@ -1049,7 +1049,11 @@ static int initialize_device(struct libusb_device *dev, uint8_t busnum,
|
|
|
d5e699 |
}
|
|
|
d5e699 |
|
|
|
d5e699 |
if (sysfs_dir && sysfs_can_relate_devices)
|
|
|
d5e699 |
+ {
|
|
|
d5e699 |
+ if (fd != wrapped_fd)
|
|
|
d5e699 |
+ close(fd);
|
|
|
d5e699 |
return LIBUSB_SUCCESS;
|
|
|
d5e699 |
+ }
|
|
|
d5e699 |
|
|
|
d5e699 |
/* cache active config */
|
|
|
d5e699 |
if (wrapped_fd < 0)
|
|
|
d5e699 |
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
|
|
|
d5e699 |
index a41e19e..aebe182 100644
|
|
|
d5e699 |
--- a/libusb/version_nano.h
|
|
|
d5e699 |
+++ b/libusb/version_nano.h
|
|
|
d5e699 |
@@ -1 +1 @@
|
|
|
d5e699 |
-#define LIBUSB_NANO 11404
|
|
|
d5e699 |
+#define LIBUSB_NANO 11411
|
|
|
d5e699 |
--
|
|
|
d5e699 |
2.26.1
|
|
|
d5e699 |
|