mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-04 05:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #51122 (Mismatched socket->fd_used accounting when using lwip_select)

Browse Source
This commit is contained in:
goldsimon 2017-06-13 20:58:45 +02:00
parent 3eaf976152
commit 85a85906d9
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/sockets.c
View File

@ -414,17 +414,27 @@ done_socket(struct lwip_sock *sock)
/* Translate a socket 'int' into a pointer (only fails if the index is invalid) */ /* Translate a socket 'int' into a pointer (only fails if the index is invalid) */
static struct lwip_sock * static struct lwip_sock *
tryget_socket_unconn(int fd) tryget_socket_unconn_nouse(int fd)
{ {
int s = fd - LWIP_SOCKET_OFFSET; int s = fd - LWIP_SOCKET_OFFSET;
if ((s < 0) || (s >= NUM_SOCKETS)) { if ((s < 0) || (s >= NUM_SOCKETS)) {
LWIP_DEBUGF(SOCKETS_DEBUG, ("tryget_socket_unconn(%d): invalid\n", fd)); LWIP_DEBUGF(SOCKETS_DEBUG, ("tryget_socket_unconn(%d): invalid\n", fd));
return NULL; return NULL;
} }
sock_inc_used(&sockets[s]);
return &sockets[s]; return &sockets[s];
} }
/* Translate a socket 'int' into a pointer (only fails if the index is invalid) */
static struct lwip_sock *
tryget_socket_unconn(int fd)
{
struct lwip_sock *ret = tryget_socket_unconn_nouse(fd);
if (ret != NULL) {
sock_inc_used(ret);
}
return ret;
}
/** /**
* Same as get_socket but doesn't set errno * Same as get_socket but doesn't set errno
* *
@ -1791,7 +1801,7 @@ lwip_select_inc_sockets_used_set(int maxfdp, fd_set *fdset, fd_set *used_sockets
SYS_ARCH_PROTECT(lev); SYS_ARCH_PROTECT(lev);
sock = tryget_socket_unconn(i); sock = tryget_socket_unconn(i);
if (sock != NULL) { if (sock != NULL) {
sock_inc_used(sock); /* leave the socket used until released by lwip_select_dec_sockets_used */
FD_SET(i, used_sockets); FD_SET(i, used_sockets);
} }
SYS_ARCH_UNPROTECT(lev); SYS_ARCH_UNPROTECT(lev);
@ -1822,7 +1832,7 @@ lwip_select_dec_sockets_used(int maxfdp, fd_set *used_sockets)
for (i = LWIP_SOCKET_OFFSET; i < maxfdp; i++) { for (i = LWIP_SOCKET_OFFSET; i < maxfdp; i++) {
/* if this FD is not in the set, continue */ /* if this FD is not in the set, continue */
if (FD_ISSET(i, used_sockets)) { if (FD_ISSET(i, used_sockets)) {
struct lwip_sock *sock = tryget_socket_unconn(i); struct lwip_sock *sock = tryget_socket_unconn_nouse(i);
LWIP_ASSERT("socket gone at the end of select", sock != NULL); LWIP_ASSERT("socket gone at the end of select", sock != NULL);
if (sock != NULL) { if (sock != NULL) {
done_socket(sock); done_socket(sock);