RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-22 01:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: When poll(2) returns -1, for some error conditions

Browse Source 
pfd[].revents is not cleared.  There are subtle errors in various programs.
In this particular case, the program should error out. ok djm millert

OpenBSD-Commit-ID: 00f839b16861f7fb2adcf122e95e8a82fa6a375c
This commit is contained in:
deraadt@openbsd.org 2022-01-21 00:53:40 +00:00 committed by Damien Miller
parent e204b34337
commit d069b020a0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssh-keyscan.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keyscan.c,v 1.144 2021/12/02 23:45:36 djm Exp $ */
/* $OpenBSD: ssh-keyscan.c,v 1.145 2022/01/21 00:53:40 deraadt Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@ -592,9 +592,11 @@ conloop(void)
else
timespecclear(&seltime);
while (ppoll(read_wait, maxfd, &seltime, NULL) == -1 &&
(errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK))
;
while (ppoll(read_wait, maxfd, &seltime, NULL) == -1) {
if (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK)
continue;
error("poll error");
}
for (i = 0; i < maxfd; i++) {
if (read_wait[i].revents & (POLLHUP|POLLERR|POLLNVAL))