KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

linux(4): Fix control message size calculation

Browse Source 
To determine the size in bytes needed to hold a control message
and its contents of length len, CMSG_SPACE should be used.

Reviewed by:
Differential Revision:	https://reviews.freebsd.org/D41224
MFC after:		1 week
This commit is contained in:
Dmitry Chagin
2023-07-29 11:21:35 +03:00
parent 38588749af
commit 67116c6905
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/compat/linux/linux_socket.c
+2 -2
View File
@@ -1852,7 +1852,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr,
if (error != 0) if (error != 0)
goto bad; goto bad;
if (outlen + LINUX_CMSG_LEN(datalen) > maxlen) { if (outlen + LINUX_CMSG_SPACE(datalen) > maxlen) {
if (outlen == 0) { if (outlen == 0) {
error = EMSGSIZE; error = EMSGSIZE;
goto err; goto err;
@@ -1871,7 +1871,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr,
error = copyout(data, outbuf, datalen); error = copyout(data, outbuf, datalen);
if (error == 0) { if (error == 0) {
outbuf += LINUX_CMSG_ALIGN(datalen); outbuf += LINUX_CMSG_ALIGN(datalen);
outlen += LINUX_CMSG_LEN(datalen); outlen += LINUX_CMSG_SPACE(datalen);
} }
} }
err: err: