Ensures that the file descriptor is (by default) not passed to
subprocesses spawned by applications using libserialport.
This fixes bug #1051.
#define TIOCOUTQ FIONWRITE
#endif
#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
/* Non-standard baudrates are not available everywhere. */
#if (defined(HAVE_TERMIOS_SPEED) || defined(HAVE_TERMIOS2_SPEED)) && HAVE_DECL_BOTHER
#define USE_TERMIOS_SPEED
#include "libserialport.h"
#include "libserialport_internal.h"
#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)
{
/*
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");
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);
continue;
count = fscanf(file, "%d", &bus);
fclose(file);
continue;
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "devnum");
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);
continue;
count = fscanf(file, "%d", &address);
fclose(file);
continue;
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "idVendor");
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);
continue;
count = fscanf(file, "%4x", &vid);
fclose(file);
continue;
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "idProduct");
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);
continue;
count = fscanf(file, "%4x", &pid);
fclose(file);
port->usb_pid = pid;
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "product");
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')
if ((ptr = fgets(description, sizeof(description), file))) {
ptr = description + strlen(description) - 1;
if (ptr >= description && *ptr == '\n')
port->description = strdup(dev);
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "manufacturer");
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')
if ((ptr = fgets(manufacturer, sizeof(manufacturer), file))) {
ptr = manufacturer + strlen(manufacturer) - 1;
if (ptr >= manufacturer && *ptr == '\n')
}
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "product");
}
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')
if ((ptr = fgets(product, sizeof(product), file))) {
ptr = product + strlen(product) - 1;
if (ptr >= product && *ptr == '\n')
}
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "serial");
}
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')
if ((ptr = fgets(serial, sizeof(serial), file))) {
ptr = serial + strlen(serial) - 1;
if (ptr >= serial && *ptr == '\n')
if (port->transport == SP_TRANSPORT_BLUETOOTH) {
snprintf(file_name, sizeof(file_name), dir_name, dev, "", "address");
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')
if ((ptr = fgets(baddr, sizeof(baddr), file))) {
ptr = baddr + strlen(baddr) - 1;
if (ptr >= baddr && *ptr == '\n')
* is to try to open them and make an ioctl call.
*/
DEBUG("serial8250 device, attempting to open");
* 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;
}
DEBUG("Open failed, skipping");
continue;
}
RETURN_CODEVAL(ret);
}
#else
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)
/* Map 'flags' to the OS-specific settings. */
if ((flags & SP_MODE_READ_WRITE) == SP_MODE_READ_WRITE)