abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 21:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #51379: (Sockets: prevent select_waiting overflow)

Browse Source
This commit is contained in:
goldsimon 2017-07-14 20:16:11 +02:00
parent aa317dcb18
commit 3c371e4d52
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/sockets.c
View File

@ -1912,13 +1912,23 @@ lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
sock = tryget_socket_unconn(i); sock = tryget_socket_unconn(i);
if (sock != NULL) { if (sock != NULL) {
sock->select_waiting++; sock->select_waiting++;
LWIP_ASSERT("sock->select_waiting > 0", sock->select_waiting > 0); if (sock->select_waiting == 0) {
/* overflow - too many threads waiting */
sock->select_waiting--;
done_socket(sock);
nready = -1;
maxfdp2 = i;
SYS_ARCH_UNPROTECT(lev);
set_errno(EBUSY);
break;
}
done_socket(sock); done_socket(sock);
} else { } else {
/* Not a valid socket */ /* Not a valid socket */
nready = -1; nready = -1;
maxfdp2 = i; maxfdp2 = i;
SYS_ARCH_UNPROTECT(lev); SYS_ARCH_UNPROTECT(lev);
set_errno(EBADF);
break; break;
} }
SYS_ARCH_UNPROTECT(lev); SYS_ARCH_UNPROTECT(lev);
@ -1969,6 +1979,7 @@ lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
} else { } else {
/* Not a valid socket */ /* Not a valid socket */
nready = -1; nready = -1;
set_errno(EBADF);
} }
SYS_ARCH_UNPROTECT(lev); SYS_ARCH_UNPROTECT(lev);
} }
@ -2002,7 +2013,6 @@ lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset,
if (nready < 0) { if (nready < 0) {
/* This happens when a socket got closed while waiting */ /* This happens when a socket got closed while waiting */
set_errno(EBADF);
lwip_select_dec_sockets_used(maxfdp1, &used_sockets); lwip_select_dec_sockets_used(maxfdp1, &used_sockets);
return -1; return -1;
} }