RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-26 03:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

OS X poll(2) is broken; use compat replacement

Browse Source 
Darwin's poll(2) implementation is broken. For character-special
devices like /dev/null, it returns POLLNVAL when polled with
POLLIN.

Apparently this is Apple bug 3710161, which is AFAIK not public,
but a websearch will find other OSS projects rediscovering it
periodically since it was first identified in 2005 (!!)
This commit is contained in:
Damien Miller 2022-01-12 08:57:49 +11:00
parent 613a6545fc
commit 61a1a6af22
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -731,6 +731,10 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
# proc_pidinfo()-based closefrom() replacement.
AC_CHECK_HEADERS([libproc.h])
AC_CHECK_FUNCS([proc_pidinfo])
# poll(2) is broken for character-special devices (at least).
# cf. Apple bug 3710161 (not public, but searchable)
AC_DEFINE([BROKEN_POLL], [1],
[System poll(2) implementation is broken])
;;
*-*-dragonfly*)
SSHDLIBS="$SSHDLIBS -lcrypt"

12
openbsd-compat/bsd-poll.c
View File

@ -15,7 +15,7 @@
*/
#include "includes.h"
#if !defined(HAVE_PPOLL) || !defined(HAVE_POLL)
#if !defined(HAVE_PPOLL) || !defined(HAVE_POLL) || defined(BROKEN_POLL)
#include <sys/types.h>
#include <sys/time.h>
@ -29,7 +29,7 @@
#include <unistd.h>
#include "bsd-poll.h"
#ifndef HAVE_PPOLL
#if !defined(HAVE_PPOLL) || defined(BROKEN_POLL)
/*
* A minimal implementation of ppoll(2), built on top of pselect(2).
*
@ -109,9 +109,9 @@ out:
errno = saved_errno;
return ret;
}
#endif /* HAVE_PPOLL */
#endif /* !HAVE_PPOLL || BROKEN_POLL */
#ifndef HAVE_POLL
#if !defined(HAVE_POLL) || defined(BROKEN_POLL)
int
poll(struct pollfd *fds, nfds_t nfds, int timeout)
{
@ -126,6 +126,6 @@ poll(struct pollfd *fds, nfds_t nfds, int timeout)
return ppoll(fds, nfds, tsp, NULL);
}
#endif /* HAVE_POLL */
#endif /* !HAVE_POLL || BROKEN_POLL */
#endif /* HAVE_PPOLL || HAVE_POLL */
#endif /* !HAVE_PPOLL || !HAVE_POLL || BROKEN_POLL */