OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

socket_rpmsg: fix ept_cb crash on server side 

after correct:
client:                 server
connect                 ns_bind --> create new conn --> create_ept
                        accept  --> set conn->psock to newpsock

Signed-off-by: ligd <liguiding1@xiaomi.com>
This commit is contained in:
ligd 2021-12-10 20:40:43 +08:00 committed by Xiang Xiao
parent 4a5d577483
commit 5c5bd7161c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/rpmsg/rpmsg_sockif.c
View File

@ -302,8 +302,13 @@ static int rpmsg_socket_ept_cb(FAR struct rpmsg_endpoint *ept,
{ {
rpmsg_socket_lock(&conn->recvlock); rpmsg_socket_lock(&conn->recvlock);
conn->sendsize = head->size; conn->sendsize = head->size;
conn->psock->s_flags |= _SF_CONNECTED;
_SO_SETERRNO(conn->psock, OK); if (conn->psock)
{
conn->psock->s_flags |= _SF_CONNECTED;
_SO_SETERRNO(conn->psock, OK);
}
rpmsg_socket_unlock(&conn->recvlock); rpmsg_socket_unlock(&conn->recvlock);
rpmsg_socket_post(&conn->sendsem); rpmsg_socket_post(&conn->sendsem);
rpmsg_socket_pollnotify(conn, POLLOUT); rpmsg_socket_pollnotify(conn, POLLOUT);
@ -527,7 +532,6 @@ static void rpmsg_socket_ns_bind(FAR struct rpmsg_device *rdev,
} }
tmp->next = new; tmp->next = new;
new->psock = server->psock;
rpmsg_socket_unlock(&server->recvlock); rpmsg_socket_unlock(&server->recvlock);
@ -770,6 +774,7 @@ static int rpmsg_socket_accept(FAR struct socket *psock,
newsock->s_sockif = psock->s_sockif; newsock->s_sockif = psock->s_sockif;
newsock->s_type = SOCK_STREAM; newsock->s_type = SOCK_STREAM;
newsock->s_conn = conn; newsock->s_conn = conn;
conn->psock = newsock;
rpmsg_socket_getaddr(conn, addr, addrlen); rpmsg_socket_getaddr(conn, addr, addrlen);