tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: clamp the minimum buffer lengths and number of inflight 

requests too

OpenBSD-Commit-ID: c4965f62fa0ba850940fd66ae3f60cf516bbcd56
This commit is contained in:
djm@openbsd.org 2023-01-11 05:39:38 +00:00 committed by Darren Tucker
parent 48bf234322
commit 93fc7c5765
No known key found for this signature in database
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sftp-client.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-client.c,v 1.167 2023/01/11 05:36:50 djm Exp $ */ /* $OpenBSD: sftp-client.c,v 1.168 2023/01/11 05:39:38 djm Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -570,6 +570,8 @@ do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests,
SFTP_MAX_MSG_LENGTH - 1024); SFTP_MAX_MSG_LENGTH - 1024);
ret->upload_buflen = MINIMUM(limits.write_length, ret->upload_buflen = MINIMUM(limits.write_length,
SFTP_MAX_MSG_LENGTH - 1024); SFTP_MAX_MSG_LENGTH - 1024);
ret->download_buflen = MAXIMUM(ret->download_buflen, 64);
ret->upload_buflen = MAXIMUM(ret->upload_buflen, 64);
debug3("server upload/download buffer sizes " debug3("server upload/download buffer sizes "
"%llu / %llu; using %u / %u", "%llu / %llu; using %u / %u",
(unsigned long long)limits.write_length, (unsigned long long)limits.write_length,
@ -581,6 +583,8 @@ do_init(int fd_in, int fd_out, u_int transfer_buflen, u_int num_requests,
if (num_requests == 0 && limits.open_handles) { if (num_requests == 0 && limits.open_handles) {
ret->num_requests = ret->num_requests =
MINIMUM(DEFAULT_NUM_REQUESTS, limits.open_handles); MINIMUM(DEFAULT_NUM_REQUESTS, limits.open_handles);
if (ret->num_requests == 0)
ret->num_requests = 1;
debug3("server handle limit %llu; using %u", debug3("server handle limit %llu; using %u",
(unsigned long long)limits.open_handles, (unsigned long long)limits.open_handles,
ret->num_requests); ret->num_requests);