lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2026-10-24 03:48:58 +03:00
Code Activity

agent: fix potential infinite loop while receiving data from SSH agent

Browse Source 
If the local SSH agent terminates while we are receiving data from it.

Refs:
https://learn.microsoft.com/windows/win32/api/fileapi/nf-fileapi-readfile#pipes
https://linux.die.net/man/2/recv
https://www.man7.org/linux/man-pages/man2/recv.2.html

Reported-by: afldl on github

Closes #2414
This commit is contained in:
Viktor Szakats
2026-07-23 20:11:00 +02:00
parent 14b9d8771c
commit d0a0210bd4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/agent.c
View File

@@ -425,11 +425,14 @@ cleanup:
int rc; \
\
while(*(total) < (length)) { \
if(!(agent)->pending_io) \
if(!(agent)->pending_io) { \
ret = (func)((agent)->pipe, (char *)(buffer) + *(total), \
(DWORD)((length) - *(total)), \
&bytes_transferred, \
&(agent)->overlapped); \
if(ret && !bytes_transferred) \
return LIBSSH2_ERROR_SOCKET_DISCONNECT; \
} \
else \
ret = GetOverlappedResult((agent)->pipe, \
&(agent)->overlapped, \
@@ -619,6 +622,8 @@ static int agent_connect_unix(LIBSSH2_AGENT *agent)
flags, abstract); \
if(rc < 0) \
return rc; \
else if(!rc) \
return LIBSSH2_ERROR_SOCKET_DISCONNECT; \
\
finished += rc; \
} \