nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-21 22:28:37 -05:00
Code Issues Projects Releases Wiki Activity

I've just discovered that using the saved sessions menu from Unix

Browse Source 
PuTTY causes the child process to inherit a lot of socket fds from
its parent, which is a pain if one of them then ends up holding open
a listening socket which the parent was using for port forwarding
after the parent itself is dead.

Therefore, this checkin sprinkles FD_CLOEXEC throughout the Unix
platform directory wherever there looks like being a long-lived fd.

[originally from svn r6917]
This commit is contained in:
Simon Tatham 2006-11-23 14:32:11 +00:00
parent 230d400ddc
commit fd6d9bd677
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
unix/uxagentc.c
View File

@ -8,6 +8,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <fcntl.h>
#include "putty.h" #include "putty.h"
#include "misc.h" #include "misc.h"
@ -121,6 +122,8 @@ int agent_query(void *in, int inlen, void **out, int *outlen,
exit(1); exit(1);
} }
fcntl(sock, F_SETFD, FD_CLOEXEC);
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, name, sizeof(addr.sun_path)); strncpy(addr.sun_path, name, sizeof(addr.sun_path));
if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {

4
unix/uxnet.c
View File

@ -470,6 +470,8 @@ static int try_connect(Actual_Socket sock)
goto ret; goto ret;
} }
fcntl(s, F_SETFD, FD_CLOEXEC);
if (sock->oobinline) { if (sock->oobinline) {
int b = TRUE; int b = TRUE;
setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (void *) &b, sizeof(b)); setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (void *) &b, sizeof(b));
@ -723,6 +725,8 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i
return (Socket) ret; return (Socket) ret;
} }
fcntl(s, F_SETFD, FD_CLOEXEC);
ret->oobinline = 0; ret->oobinline = 0;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on)); setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on));

8
unix/uxpty.c
View File

@ -275,8 +275,10 @@ static void fatal_sig_handler(int signum)
static int pty_open_slave(Pty pty) static int pty_open_slave(Pty pty)
{ {
if (pty->slave_fd < 0) if (pty->slave_fd < 0) {
pty->slave_fd = open(pty->name, O_RDWR); pty->slave_fd = open(pty->name, O_RDWR);
fcntl(pty->slave_fd, F_SETFD, FD_CLOEXEC);
}
return pty->slave_fd; return pty->slave_fd;
} }
@ -307,6 +309,8 @@ static void pty_open_master(Pty pty)
strcpy(pty->name, master_name); strcpy(pty->name, master_name);
pty->name[5] = 't'; /* /dev/ptyXX -> /dev/ttyXX */ pty->name[5] = 't'; /* /dev/ptyXX -> /dev/ttyXX */
fcntl(pty->master_fd, F_SETFD, FD_CLOEXEC);
if (pty_open_slave(pty) >= 0 && if (pty_open_slave(pty) >= 0 &&
access(pty->name, R_OK | W_OK) == 0) access(pty->name, R_OK | W_OK) == 0)
goto got_one; goto got_one;
@ -346,6 +350,8 @@ static void pty_open_master(Pty pty)
exit(1); exit(1);
} }
fcntl(pty->master_fd, F_SETFD, FD_CLOEXEC);
pty->name[FILENAME_MAX-1] = '\0'; pty->name[FILENAME_MAX-1] = '\0';
strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1); strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);
#endif #endif

2
unix/uxser.c
View File

@ -257,6 +257,8 @@ static const char *serial_init(void *frontend_handle, void **backend_handle,
if (serial->fd < 0) if (serial->fd < 0)
return "Unable to open serial port"; return "Unable to open serial port";
fcntl(serial->fd, F_SETFD, FD_CLOEXEC);
err = serial_configure(serial, cfg); err = serial_configure(serial, cfg);
if (err) if (err)
return err; return err;