[PATCH] android/tester: Fix closing invalid fd

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

 



From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>

This fixes possible closing invalid fd in a case socket() fails
---
 android/android-tester.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/android-tester.c b/android/android-tester.c
index 09c76c9..12d7613 100644
--- a/android/android-tester.c
+++ b/android/android-tester.c
@@ -357,8 +357,10 @@ static void emulator(int pipe, int hci_index)
 	ssize_t len;
 
 	fd = socket(PF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-	if (fd < 0)
-		goto failed;
+	if (fd < 0) {
+		close(pipe)
+		return;
+	}
 
 	tv.tv_sec = WAIT_FOR_SIGNAL_TIME;
 	tv.tv_usec = 0;
@@ -374,7 +376,6 @@ static void emulator(int pipe, int hci_index)
 	}
 
 	len = write(pipe, EMULATOR_SIGNAL, sizeof(EMULATOR_SIGNAL));
-
 	if (len != sizeof(EMULATOR_SIGNAL))
 		goto failed;
 
-- 
1.8.3.2

--
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