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 | |
| 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@
| -rw-r--r-- | usr.sbin/dhcrelay/dhcrelay.c | 8 | ||||
| -rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy.c | 9 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/rtadvd.c | 8 | ||||
| -rw-r--r-- | usr.sbin/tftpd/tftpd.c | 8 |
4 files changed, 29 insertions, 4 deletions
diff --git a/usr.sbin/dhcrelay/dhcrelay.c b/usr.sbin/dhcrelay/dhcrelay.c index 54ee05a6fc3..497656bea8d 100644 --- a/usr.sbin/dhcrelay/dhcrelay.c +++ b/usr.sbin/dhcrelay/dhcrelay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcrelay.c,v 1.42 2016/09/15 16:16:03 jca Exp $ */ +/* $OpenBSD: dhcrelay.c,v 1.43 2016/09/26 17:15:19 jca Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org> @@ -368,6 +368,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: 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: diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index 84c811abee4..990d9785c2d 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtadvd.c,v 1.81 2016/09/21 18:54:24 jca Exp $ */ +/* $OpenBSD: rtadvd.c,v 1.82 2016/09/26 17:15:19 jca Exp $ */ /* $KAME: rtadvd.c,v 1.66 2002/05/29 14:18:36 itojun Exp $ */ /* @@ -1320,6 +1320,12 @@ ra_timer_update(struct rainfo *rai) int rdaemon(int devnull) { + if (devnull == -1) { + errno = EBADF; + return (-1); + } + if (fcntl(devnull, F_GETFL) == -1) + return (-1); switch (fork()) { case -1: diff --git a/usr.sbin/tftpd/tftpd.c b/usr.sbin/tftpd/tftpd.c index 6a76ae14e11..a7e415649d2 100644 --- a/usr.sbin/tftpd/tftpd.c +++ b/usr.sbin/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.37 2016/09/04 14:41:49 florian Exp $ */ +/* $OpenBSD: tftpd.c,v 1.38 2016/09/26 17:15:19 jca Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@uq.edu.au> @@ -1584,6 +1584,12 @@ getip(void *s) int rdaemon(int devnull) { + if (devnull == -1) { + errno = EBADF; + return (-1); + } + if (fcntl(devnull, F_GETFL) == -1) + return (-1); switch (fork()) { case -1: |