Author: trasz
Date: Mon Aug 24 15:56:31 2020
New Revision: 364699
URL: https://svnweb.freebsd.org/changeset/base/364699
Log:
MFC r348418 by dchagin:
Linux does not support MSG_OOB for unix(4) or non-stream oriented socket,
return EOPNOTSUPP as a Linux does.
Modified:
stable/12/sys/compat/linux/linux_socket.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/compat/linux/linux_socket.c
==============================================================================
--- stable/12/sys/compat/linux/linux_socket.c Mon Aug 24 15:54:58 2020
(r364698)
+++ stable/12/sys/compat/linux/linux_socket.c Mon Aug 24 15:56:31 2020
(r364699)
@@ -946,11 +946,13 @@ linux_sendmsg_common(struct thread *td, l_int s, struc
struct iovec *iov;
socklen_t datalen;
struct sockaddr *sa;
+ struct socket *so;
sa_family_t sa_family;
+ struct file *fp;
void *data;
l_size_t len;
l_size_t clen;
- int error;
+ int error, fflag;
error = copyin(msghdr, &linux_msg, sizeof(linux_msg));
if (error != 0)
@@ -981,12 +983,30 @@ linux_sendmsg_common(struct thread *td, l_int s, struc
control = NULL;
- if (linux_msg.msg_controllen >= sizeof(struct l_cmsghdr)) {
- error = kern_getsockname(td, s, &sa, &datalen);
+ error = kern_getsockname(td, s, &sa, &datalen);
+ if (error != 0)
+ goto bad;
+ sa_family = sa->sa_family;
+ free(sa, M_SONAME);
+
+ if (flags & LINUX_MSG_OOB) {
+ error = EOPNOTSUPP;
+ if (sa_family == AF_UNIX)
+ goto bad;
+
+ error = getsock_cap(td, s, &cap_send_rights, &fp,
+ &fflag, NULL);
if (error != 0)
goto bad;
- sa_family = sa->sa_family;
- free(sa, M_SONAME);
+ so = fp->f_data;
+ if (so->so_type != SOCK_STREAM)
+ error = EOPNOTSUPP;
+ fdrop(fp, td);
+ if (error != 0)
+ goto bad;
+ }
+
+ if (linux_msg.msg_controllen >= sizeof(struct l_cmsghdr)) {
error = ENOBUFS;
control = m_get(M_WAITOK, MT_CONTROL);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
