=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp-server.c,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- src/usr.bin/ssh/sftp-server.c 2021/11/14 03:25:10 1.132 +++ src/usr.bin/ssh/sftp-server.c 2021/11/14 06:15:36 1.133 @@ -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. * @@ -1796,8 +1796,6 @@ 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 @@ -1806,14 +1804,18 @@ */ 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)