ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-03-03 18:52:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Limit size of the iovect passed to writev in packet.c

Browse Source
This commit is contained in:
Ronny Meeus 2014-05-20 21:18:48 +08:00
parent cd700aaf6e
commit 0e0ff51582
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packet.c
View File

@ -64,13 +64,24 @@ void write_packet() {
struct iovec *iov = NULL; struct iovec *iov = NULL;
int i; int i;
struct Link *l; struct Link *l;
int iov_max_count;
#endif #endif
TRACE2(("enter write_packet")) TRACE2(("enter write_packet"))
dropbear_assert(!isempty(&ses.writequeue)); dropbear_assert(!isempty(&ses.writequeue));
#ifdef HAVE_WRITEV #ifdef HAVE_WRITEV
iov = m_malloc(sizeof(*iov) * ses.writequeue.count);
#ifndef IOV_MAX
#define IOV_MAX UIO_MAXIOV
#endif
/* Make sure the size of the iov is below the maximum allowed by the OS. */
iov_max_count = ses.writequeue.count;
if (iov_max_count > IOV_MAX)
iov_max_count = IOV_MAX;
iov = m_malloc(sizeof(*iov) * iov_max_count);
for (l = ses.writequeue.head, i = 0; l; l = l->link, i++) for (l = ses.writequeue.head, i = 0; l; l = l->link, i++)
{ {
writebuf = (buffer*)l->item; writebuf = (buffer*)l->item;
@ -83,7 +94,7 @@ void write_packet() {
iov[i].iov_base = buf_getptr(writebuf, len); iov[i].iov_base = buf_getptr(writebuf, len);
iov[i].iov_len = len; iov[i].iov_len = len;
} }
written = writev(ses.sock_out, iov, ses.writequeue.count); written = writev(ses.sock_out, iov, iov_max_count);
if (written < 0) { if (written < 0) {
if (errno == EINTR) { if (errno == EINTR) {
m_free(iov); m_free(iov);