d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not leak sa in linux_recvmsg() call if kern_recvit() fails.

Browse Source 
MFC after:	1 week
This commit is contained in:
Dmitry Chagin 2019-05-21 18:08:19 +00:00
parent 57cb29a73e
commit 8128cfc59e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/compat/linux/linux_socket.c
View File

@ -1155,7 +1155,8 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr,
if (msg->msg_name) {
sa = malloc(msg->msg_namelen, M_SONAME, M_WAITOK);
msg->msg_name = sa;
}
} else
sa = NULL;
uiov = msg->msg_iov;
msg->msg_iov = iov;
@ -1172,7 +1173,6 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr,
error = copyout(lsa, PTRIN(msg->msg_name),
msg->msg_namelen);
free(lsa, M_SONAME);
free(sa, M_SONAME);
if (error != 0)
goto bad;
}
@ -1292,6 +1292,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr,
}
free(iov, M_IOV);
free(linux_cmsg, M_LINUX);
free(sa, M_SONAME);
return (error);
}