From 96921f4986cebab89014f4b188cc00426e2e11d8 Mon Sep 17 00:00:00 2001 From: deraadt Date: Sun, 14 Nov 2021 06:15:36 +0000 Subject: [PATCH] match .events with .fd better --- usr.bin/ssh/sftp-server.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c index 1c8e83be5b1..6fcb6a12684 100644 --- a/usr.bin/ssh/sftp-server.c +++ b/usr.bin/ssh/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. * @@ -1796,8 +1796,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 @@ -1806,14 +1804,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) -- 2.20.1