Date: Sun, 27 Mar 2016 07:34:42 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r297306 - stable/10/sys/compat/linux Message-ID: <201603270734.u2R7Yg8l030486@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Sun Mar 27 07:34:42 2016 New Revision: 297306 URL: https://svnweb.freebsd.org/changeset/base/297306 Log: Revert r297303. 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:55:49 2016 (r297305) +++ stable/10/sys/compat/linux/linux_socket.c Sun Mar 27 07:34:42 2016 (r297306) @@ -838,10 +838,7 @@ linux_accept_common(struct thread *td, i socklen_t * __restrict anamelen; int flags; } */ bsd_args; - cap_rights_t rights; - struct socket *so; - struct file *fp; - int error, error1; + int error; bsd_args.s = s; /* XXX: */ @@ -856,17 +853,6 @@ 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603270734.u2R7Yg8l030486>