diff options
| author | deraadt@openbsd.org <deraadt@openbsd.org> | 2021-11-14 07:15:36 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-11-17 23:12:28 +0100 |
| commit | 092d29b232ef1a19609a5316ed7e4d896bb2e696 (patch) | |
| tree | 1b12a7c3142187ac83843af29256177133f04df5 /sftp-server.c | |
| parent | upstream: convert select() to poll() ok djm (diff) | |
| download | openssh-092d29b232ef1a19609a5316ed7e4d896bb2e696.tar.xz openssh-092d29b232ef1a19609a5316ed7e4d896bb2e696.zip | |
upstream: match .events with .fd better
OpenBSD-Commit-ID: 77eef212ca0add905949532af390164489c5984b
Diffstat (limited to 'sftp-server.c')
| -rw-r--r-- | sftp-server.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sftp-server.c b/sftp-server.c index 3f3de399d..7db74004f 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-server.c,v 1.132 2021/11/14 03:25:10 deraadt Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.133 2021/11/14 06:15:36 deraadt Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -1844,8 +1844,6 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) memset(pfd, 0, sizeof pfd); pfd[0].fd = pfd[1].fd = -1; - pfd[0].events = POLLIN; - pfd[1].events = POLLOUT; /* * Ensure that we can read a full buffer and handle @@ -1854,14 +1852,18 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) */ if ((r = sshbuf_check_reserve(iqueue, sizeof(buf))) == 0 && (r = sshbuf_check_reserve(oqueue, - SFTP_MAX_MSG_LENGTH)) == 0) + SFTP_MAX_MSG_LENGTH)) == 0) { pfd[0].fd = in; + pfd[0].events = POLLIN; + } else if (r != SSH_ERR_NO_BUFFER_SPACE) fatal_fr(r, "reserve"); olen = sshbuf_len(oqueue); - if (olen > 0) + if (olen > 0) { pfd[1].fd = out; + pfd[1].events = POLLOUT; + } if (poll(pfd, 2, -1) == -1) { if (errno == EINTR) |