sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/telnet: fix a potential busyloop if rxbuffer writes faster than read

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2021-06-01 14:03:56 +08:00 committed by Xiang Xiao
parent 7300bc8f1c
commit 50f415d529
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/telnet.c
View File

@ -866,6 +866,13 @@ static ssize_t telnet_read(FAR struct file *filep, FAR char *buffer,
} }
while (nread == 0); while (nread == 0);
/* Notify the I/O thread the rxbuffer is available */
if (nread > 0)
{
nxsem_post(&g_iosem);
}
/* Returned Value: /* Returned Value:
* *
* nread > 0: The number of characters copied into the user buffer by * nread > 0: The number of characters copied into the user buffer by
@ -1270,7 +1277,10 @@ static int telnet_io_main(int argc, FAR char** argv)
for (i = 0; i < CONFIG_TELNET_MAXLCLIENTS; i++) for (i = 0; i < CONFIG_TELNET_MAXLCLIENTS; i++)
{ {
priv = g_telnet_clients[i]; priv = g_telnet_clients[i];
if (priv != NULL && !(priv->td_fds.revents & (POLLHUP | POLLERR))) if (priv != NULL &&
!(priv->td_fds.revents & (POLLHUP | POLLERR)) &&
(CONFIG_TELNET_RXBUFFER_SIZE -
priv->td_pending - priv->td_offset) > 0)
{ {
priv->td_fds.sem = &g_iosem; priv->td_fds.sem = &g_iosem;
priv->td_fds.events = POLLIN | POLLHUP | POLLERR; priv->td_fds.events = POLLIN | POLLHUP | POLLERR;