svn commit: r297303 - stable/10/sys/compat/linux

[Dmitry Chagin]

Author: dchagin
Date: Sun Mar 27 06:43:05 2016
New Revision: 297303
URL: https://svnweb.freebsd.org/changeset/base/297303

Log:
  MFC r296503, r296504:
  
  Linux accept() system call return EOPNOTSUPP errno instead of EINVAL for UDP sockets.

Modified:
  stable/10/sys/compat/linux/linux_socket.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/compat/linux/linux_socket.c
==============================================================================
--- stable/10/sys/compat/linux/linux_socket.c	Sun Mar 27 06:21:05 2016	(r297302)
+++ stable/10/sys/compat/linux/linux_socket.c	Sun Mar 27 06:43:05 2016	(r297303)
@@ -838,7 +838,10 @@ linux_accept_common(struct thread *td, i
 		socklen_t * __restrict anamelen;
 		int	flags;
 	} */ bsd_args;
-	int error;
+	cap_rights_t rights;
+	struct socket *so;
+	struct file *fp;
+	int error, error1;
 
 	bsd_args.s = s;
 	/* XXX: */
@@ -853,6 +856,17 @@ linux_accept_common(struct thread *td, i
 	if (error) {
 		if (error == EFAULT && namelen != sizeof(struct sockaddr_in))
 			return (EINVAL);
+		if (error == EINVAL) {
+			error1 = getsock_cap(td, s, &rights, &fp, NULL);
+			if (error1 != 0)
+				return (error1);
+			so = fp->f_data;
+			if (so->so_type == SOCK_DGRAM) {
+				fdrop(fp, td);
+				return (EOPNOTSUPP);
+			}
+			fdrop(fp, td);
+		}
 		return (error);
 	}
 	if (addr)