diff options
| author |   jca <jca@openbsd.org> | 2016-09-26 17:15:19 +0000 |
|---|---|---|
| committer | jca <jca@openbsd.org> | 2016-09-26 17:15:19 +0000 |
| commit | ec8c17428469f209b3236e849ba664dbe3d6f9f4 (patch) | |
| tree | 5afddc4e021c3d72a8bbe490abf7d15c1f1b4ee2 /usr.sbin/ftp-proxy | |
| parent | Pass the flags argument of recvfromto down to the underlying recvmsg (diff) | |
| download | wireguard-openbsd-ec8c17428469f209b3236e849ba664dbe3d6f9f4.tar.xz wireguard-openbsd-ec8c17428469f209b3236e849ba664dbe3d6f9f4.zip | |
Exit early from rdaemon() is the passed fd is invalid.
fd == -1 check suggested by deraadt@, ok florian@
Diffstat (limited to 'usr.sbin/ftp-proxy')
| -rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.c b/usr.sbin/ftp-proxy/ftp-proxy.c index 74216d0791f..611bb6b02f9 100644 --- a/usr.sbin/ftp-proxy/ftp-proxy.c +++ b/usr.sbin/ftp-proxy/ftp-proxy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp-proxy.c,v 1.35 2016/09/15 16:16:03 jca Exp $ */ +/* $OpenBSD: ftp-proxy.c,v 1.36 2016/09/26 17:15:19 jca Exp $ */ /* * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl> @@ -633,6 +633,7 @@ main(int argc, char *argv[]) verbose = 0; /* Other initialization. */ + devnull = -1; id_count = 1; session_count = 0; @@ -1142,6 +1143,12 @@ usage(void) int rdaemon(int devnull) { + if (devnull == -1) { + errno = EBADF; + return (-1); + } + if (fcntl(devnull, F_GETFL) == -1) + return (-1); switch (fork()) { case -1: |