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

linux(4): Skip unsupported anxiliary message

Browse Source 
Instead of returning error, skip unsupported anxiliary messages and
fail if no one handled.

MFC after:	1 week
This commit is contained in:
Dmitry Chagin 2023-08-14 15:46:12 +03:00
parent a21238d843
commit bbaa5523c0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1728,7 +1728,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr,
struct sockaddr *sa;
caddr_t outbuf;
void *data, *udata;
int error;
int error, skiped;
error = copyin(msghdr, &l_msghdr, sizeof(l_msghdr));
if (error != 0)
@ -1794,7 +1794,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr,
msg->msg_control = mtod(control, struct cmsghdr *);
msg->msg_controllen = control->m_len;
outbuf = PTRIN(l_msghdr.msg_control);
outlen = 0;
skiped = outlen = 0;
for (m = control; m != NULL; m = m->m_next) {
cm = mtod(m, struct cmsghdr *);
lcm->cmsg_type = bsd_to_linux_cmsg_type(p, cm->cmsg_type,
@ -1814,12 +1814,13 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr,
}
if (lcm->cmsg_type == -1 ||
cm->cmsg_level != SOL_SOCKET) {
cm->cmsg_level == -1) {
LINUX_RATELIMIT_MSG_OPT2(
"unsupported recvmsg cmsg level %d type %d",
cm->cmsg_level, cm->cmsg_type);
error = EINVAL;
goto bad;
/* Skip unsupported messages */
skiped++;
continue;
}
switch (cm->cmsg_type) {
@ -1877,6 +1878,10 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr,
if (error != 0)
goto bad;
}
if (outlen == 0 && skiped > 0) {
error = EINVAL;
goto bad;
}
l_msghdr.msg_controllen = outlen;
out: