From: Christian Seiler <redacted>
Date: Sun, 15 Oct 2017 17:28:05 +0000 (+0200)
Subject: Use O_CLOEXEC where available
X-Git-Tag: libserialport-0.1.2~79
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=fa106ef155a8b18e1dc87ccc6d4cf102068fe114;p=libserialport.git

Use O_CLOEXEC where available

Ensures that the file descriptor is (by default) not passed to
subprocesses spawned by applications using libserialport.

This fixes bug #1051.
---

diff --git a/libserialport_internal.h b/libserialport_internal.h
index dd69733..d784472 100644
--- a/libserialport_internal.h
+++ b/libserialport_internal.h
@@ -85,6 +85,16 @@
 #define TIOCOUTQ FIONWRITE
 #endif
 
+/*
+ * O_CLOEXEC is not available everywhere, fallback to not setting the
+ * flag on those systems.
+ */
+#ifndef _WIN32
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
+#endif
+
 /* Non-standard baudrates are not available everywhere. */
 #if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && HAVE_DECL_BOTHER
 #define USE_TERMIOS_SPEED
diff --git a/linux.c b/linux.c
index 7913394..0f1367f 100644
--- a/linux.c
+++ b/linux.c
@@ -22,6 +22,18 @@
 #include "libserialport.h"
 #include "libserialport_internal.h"
 
+/*
+ * The 'e' modifier for O_CLOEXEC is glibc >= 2.7 only, hence not
+ * portable, so provide an own wrapper for this functionality.
+ */
+static FILE *fopen_cloexec_rdonly(const char *pathname)
+{
+	int fd;
+	if ((fd = open(pathname, O_RDONLY | O_CLOEXEC)) < 0)
+		return NULL;
+	return fdopen(fd, "r");
+}
+
 SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 {
 	/*
@@ -62,7 +74,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 			strcat(sub_dir, "../");
 
 			snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "busnum");
-			if (!(file = fopen(file_name, "r")))
+			if (!(file = fopen_cloexec_rdonly(file_name)))
 				continue;
 			count = fscanf(file, "%d", &bus);
 			fclose(file);
@@ -70,7 +82,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 				continue;
 
 			snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "devnum");
-			if (!(file = fopen(file_name, "r")))
+			if (!(file = fopen_cloexec_rdonly(file_name)))
 				continue;
 			count = fscanf(file, "%d", &address);
 			fclose(file);
@@ -78,7 +90,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 				continue;
 
 			snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "idVendor");
-			if (!(file = fopen(file_name, "r")))
+			if (!(file = fopen_cloexec_rdonly(file_name)))
 				continue;
 			count = fscanf(file, "%4x", &vid);
 			fclose(file);
@@ -86,7 +98,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 				continue;
 
 			snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "idProduct");
-			if (!(file = fopen(file_name, "r")))
+			if (!(file = fopen_cloexec_rdonly(file_name)))
 				continue;
 			count = fscanf(file, "%4x", &pid);
 			fclose(file);
@@ -99,7 +111,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 			port->usb_pid = pid;
 
 			snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "product");
-			if ((file = fopen(file_name, "r"))) {
+			if ((file = fopen_cloexec_rdonly(file_name))) {
 				if ((ptr = fgets(description, sizeof(description), file))) {
 					ptr = description + strlen(description) - 1;
 					if (ptr >= description && *ptr == '\n')
@@ -112,7 +124,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 				port->description = strdup(dev);
 
 			snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "manufacturer");
-			if ((file = fopen(file_name, "r"))) {
+			if ((file = fopen_cloexec_rdonly(file_name))) {
 				if ((ptr = fgets(manufacturer, sizeof(manufacturer), file))) {
 					ptr = manufacturer + strlen(manufacturer) - 1;
 					if (ptr >= manufacturer && *ptr == '\n')
@@ -123,7 +135,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 			}
 
 			snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "product");
-			if ((file = fopen(file_name, "r"))) {
+			if ((file = fopen_cloexec_rdonly(file_name))) {
 				if ((ptr = fgets(product, sizeof(product), file))) {
 					ptr = product + strlen(product) - 1;
 					if (ptr >= product && *ptr == '\n')
@@ -134,7 +146,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 			}
 
 			snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "serial");
-			if ((file = fopen(file_name, "r"))) {
+			if ((file = fopen_cloexec_rdonly(file_name))) {
 				if ((ptr = fgets(serial, sizeof(serial), file))) {
 					ptr = serial + strlen(serial) - 1;
 					if (ptr >= serial && *ptr == '\n')
@@ -160,7 +172,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 
 		if (port->transport == SP_TRANSPORT_BLUETOOTH) {
 			snprintf(file_name, sizeof(file_name), dir_name, dev, "", "address");
-			if ((file = fopen(file_name, "r"))) {
+			if ((file = fopen_cloexec_rdonly(file_name))) {
 				if ((ptr = fgets(baddr, sizeof(baddr), file))) {
 					ptr = baddr + strlen(baddr) - 1;
 					if (ptr >= baddr && *ptr == '\n')
@@ -215,7 +227,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 			 * is to try to open them and make an ioctl call.
 			 */
 			DEBUG("serial8250 device, attempting to open");
-			if ((fd = open(name, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) {
+			if ((fd = open(name, O_RDWR | O_NONBLOCK | O_NOCTTY | O_CLOEXEC)) < 0) {
 				DEBUG("Open failed, skipping");
 				continue;
 			}
diff --git a/serialport.c b/serialport.c
index 2c1b682..9e56e89 100644
--- a/serialport.c
+++ b/serialport.c
@@ -563,7 +563,7 @@ SP_API enum sp_return sp_open(struct sp_port *port, enum sp_mode flags)
 		RETURN_CODEVAL(ret);
 	}
 #else
-	int flags_local = O_NONBLOCK | O_NOCTTY;
+	int flags_local = O_NONBLOCK | O_NOCTTY | O_CLOEXEC;
 
 	/* Map 'flags' to the OS-specific settings. */
 	if ((flags & SP_MODE_READ_WRITE) == SP_MODE_READ_WRITE)