nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 12:08:36 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/tcp: fix send deadlock if disconnect

Browse source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2021-12-15 21:26:18 +08:00 committed by Xiang Xiao
parent 0aecfe8691
commit 0ee7400fdf
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
net/tcp/tcp_send_buffered.c
View file

@ -1033,14 +1033,15 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
bool nonblock;
int ret = OK;
if (psock == NULL || psock->s_conn == NULL)
if (psock == NULL || psock->s_type != SOCK_STREAM ||
psock->s_conn == NULL)
{
nerr("ERROR: Invalid socket\n");
ret = -EBADF;
goto errout;
}
if (psock->s_type != SOCK_STREAM || !_SS_ISCONNECTED(psock->s_flags))
if (!_SS_ISCONNECTED(psock->s_flags))
{
nerr("ERROR: Not connected\n");
ret = -ENOTCONN;
@ -1100,6 +1101,17 @@ ssize_t psock_tcp_send(FAR struct socket *psock, FAR const void *buf,
net_lock();
/* Now that we have the network locked, we need to check the connection
* state again to ensure the connection is still valid.
*/
if (!_SS_ISCONNECTED(psock->s_flags))
{
nerr("ERROR: No longer connected\n");
ret = -ENOTCONN;
goto errout_with_lock;
}
/* Allocate resources to receive a callback */
if (psock->s_sndcb == NULL)

5
net/tcp/tcp_send_unbuffered.c
View file

@ -463,7 +463,8 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
/* Verify that the sockfd corresponds to valid, allocated socket */
if (psock == NULL || psock->s_conn == NULL)
if (psock == NULL || psock->s_type != SOCK_STREAM ||
psock->s_conn == NULL)
{
nerr("ERROR: Invalid socket\n");
ret = -EBADF;
@ -475,7 +476,7 @@ ssize_t psock_tcp_send(FAR struct socket *psock,
* guarantee the state won't change until we have the network locked.
*/
if (psock->s_type != SOCK_STREAM)
if (!_SS_ISCONNECTED(psock->s_flags))
{
nerr("ERROR: Not connected\n");
ret = -ENOTCONN;