[PATCH] tools/hcidump: Add missing socket close()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Add socket close() calls, in case socket operations fail.
---
 tools/hcidump.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/hcidump.c b/tools/hcidump.c
index 20749f3..5fc45e9 100644
--- a/tools/hcidump.c
+++ b/tools/hcidump.c
@@ -548,12 +548,14 @@ static int open_socket(int dev, unsigned long flags)
 	opt = 1;
 	if (setsockopt(sk, SOL_HCI, HCI_DATA_DIR, &opt, sizeof(opt)) < 0) {
 		perror("Can't enable data direction info");
+		close(sk);
 		return -1;
 	}
 
 	opt = 1;
 	if (setsockopt(sk, SOL_HCI, HCI_TIME_STAMP, &opt, sizeof(opt)) < 0) {
 		perror("Can't enable time stamp");
+		close(sk);
 		return -1;
 	}
 
@@ -563,6 +565,7 @@ static int open_socket(int dev, unsigned long flags)
 	hci_filter_all_events(&flt);
 	if (setsockopt(sk, SOL_HCI, HCI_FILTER, &flt, sizeof(flt)) < 0) {
 		perror("Can't set filter");
+		close(sk);
 		return -1;
 	}
 
@@ -573,6 +576,7 @@ static int open_socket(int dev, unsigned long flags)
 	if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
 		printf("Can't attach to device hci%d. %s(%d)\n",
 					dev, strerror(errno), errno);
+		close(sk);
 		return -1;
 	}
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux