Skip to content

net/local: fix SCM_RIGHTS pointer and memory corruption #19902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bogdan0759 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −3
Open

net/local: fix SCM_RIGHTS pointer and memory corruption #19902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions net/local/local_conn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,7 @@ void local_free(FAR struct local_conn_s *conn)
{
if (conn->lc_cfps[i])
{
file_close(conn->lc_cfps[i]);
kmm_free(conn->lc_cfps[i]);
file_put(conn->lc_cfps[i]);
conn->lc_cfps[i] = NULL;
}
}
Expand Down
2 changes: 1 addition & 1 deletion net/local/local_recvmsg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static void local_recvctl(FAR struct local_conn_s *conn,
{
if (peer->lc_cfpcount)
{
memmove(peer->lc_cfps[0], peer->lc_cfps[i],
memmove(&peer->lc_cfps[0], &peer->lc_cfps[i],
sizeof(FAR void *) * peer->lc_cfpcount);
}
}
Expand Down
5 changes: 5 additions & 0 deletions net/local/local_sendmsg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ static void local_freectl(FAR struct local_conn_s *conn, int count)
{
FAR struct local_conn_s *peer = conn->lc_peer;

if (peer == NULL)
{
peer = conn;
}

while (count-- > 0)
{
file_put(peer->lc_cfps[--peer->lc_cfpcount]);
Expand Down
Loading