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

accept.c edited online with Bitbucket. Fix mismatched net_lock() and net_unlock()

Browse Source
This commit is contained in:
Gregory Nutt 2017-08-31 16:49:10 +00:00
parent 27cfde9968
commit 606b7215fe
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/socket/accept.c
View File

@ -139,13 +139,15 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
if (psock == NULL || psock->s_conn == NULL)
{
nerr("ERROR: Socket invalid or not opened\n");
return -EINVAL;
errcode = EINVAL;
goto errout;
}
/* Is the socket listening for a connection? */
if (!_SS_ISLISTENING(psock->s_flags))
{
nerr("ERROR: Socket is not listening for a connection.\n");
errcode = EINVAL;
goto errout;
}
@ -160,7 +162,7 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
{
nerr("ERROR: si_accept failed: %d\n", ret);
errcode = -ret;
goto errout;
goto errout_with_lock;
}
/* Mark the new socket as connected. */
@ -172,6 +174,9 @@ int psock_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
leave_cancellation_point();
return OK;
errout_with_lock:
net_unlock();
errout:
set_errno(errcode);
leave_cancellation_point();