Merge tag 'docs-4.9-2' of git://git.lwn.net/linux

[cascardo/linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 5f77a8e..5a9bf5e 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -320,11 +320,38 @@ static const struct dentry_operations sockfs_dentry_operations = {
        .d_dname  = sockfs_dname,
 };
 
+static int sockfs_xattr_get(const struct xattr_handler *handler,
+                           struct dentry *dentry, struct inode *inode,
+                           const char *suffix, void *value, size_t size)
+{
+       if (value) {
+               if (dentry->d_name.len + 1 > size)
+                       return -ERANGE;
+               memcpy(value, dentry->d_name.name, dentry->d_name.len + 1);
+       }
+       return dentry->d_name.len + 1;
+}
+
+#define XATTR_SOCKPROTONAME_SUFFIX "sockprotoname"
+#define XATTR_NAME_SOCKPROTONAME (XATTR_SYSTEM_PREFIX XATTR_SOCKPROTONAME_SUFFIX)
+#define XATTR_NAME_SOCKPROTONAME_LEN (sizeof(XATTR_NAME_SOCKPROTONAME)-1)
+
+static const struct xattr_handler sockfs_xattr_handler = {
+       .name = XATTR_NAME_SOCKPROTONAME,
+       .get = sockfs_xattr_get,
+};
+
+static const struct xattr_handler *sockfs_xattr_handlers[] = {
+       &sockfs_xattr_handler,
+       NULL
+};
+
 static struct dentry *sockfs_mount(struct file_system_type *fs_type,
                         int flags, const char *dev_name, void *data)
 {
-       return mount_pseudo(fs_type, "socket:", &sockfs_ops,
-               &sockfs_dentry_operations, SOCKFS_MAGIC);
+       return mount_pseudo_xattr(fs_type, "socket:", &sockfs_ops,
+                                 sockfs_xattr_handlers,
+                                 &sockfs_dentry_operations, SOCKFS_MAGIC);
 }
 
 static struct vfsmount *sock_mnt __read_mostly;
@@ -463,35 +490,6 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
        return NULL;
 }
 
-#define XATTR_SOCKPROTONAME_SUFFIX "sockprotoname"
-#define XATTR_NAME_SOCKPROTONAME (XATTR_SYSTEM_PREFIX XATTR_SOCKPROTONAME_SUFFIX)
-#define XATTR_NAME_SOCKPROTONAME_LEN (sizeof(XATTR_NAME_SOCKPROTONAME)-1)
-static ssize_t sockfs_getxattr(struct dentry *dentry,
-                              const char *name, void *value, size_t size)
-{
-       const char *proto_name;
-       size_t proto_size;
-       int error;
-
-       error = -ENODATA;
-       if (!strncmp(name, XATTR_NAME_SOCKPROTONAME, XATTR_NAME_SOCKPROTONAME_LEN)) {
-               proto_name = dentry->d_name.name;
-               proto_size = strlen(proto_name);
-
-               if (value) {
-                       error = -ERANGE;
-                       if (proto_size + 1 > size)
-                               goto out;
-
-                       strncpy(value, proto_name, proto_size + 1);
-               }
-               error = proto_size + 1;
-       }
-
-out:
-       return error;
-}
-
 static ssize_t sockfs_listxattr(struct dentry *dentry, char *buffer,
                                size_t size)
 {
@@ -521,7 +519,6 @@ static ssize_t sockfs_listxattr(struct dentry *dentry, char *buffer,
 }
 
 static const struct inode_operations sockfs_inode_ops = {
-       .getxattr = sockfs_getxattr,
        .listxattr = sockfs_listxattr,
 };
 
@@ -587,22 +584,19 @@ void sock_release(struct socket *sock)
 }
 EXPORT_SYMBOL(sock_release);
 
-void __sock_tx_timestamp(const struct sock *sk, __u8 *tx_flags)
+void __sock_tx_timestamp(__u16 tsflags, __u8 *tx_flags)
 {
        u8 flags = *tx_flags;
 
-       if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_HARDWARE)
+       if (tsflags & SOF_TIMESTAMPING_TX_HARDWARE)
                flags |= SKBTX_HW_TSTAMP;
 
-       if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_SOFTWARE)
+       if (tsflags & SOF_TIMESTAMPING_TX_SOFTWARE)
                flags |= SKBTX_SW_TSTAMP;
 
-       if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED)
+       if (tsflags & SOF_TIMESTAMPING_TX_SCHED)
                flags |= SKBTX_SCHED_TSTAMP;
 
-       if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK)
-               flags |= SKBTX_ACK_TSTAMP;
-
        *tx_flags = flags;
 }
 EXPORT_SYMBOL(__sock_tx_timestamp);
@@ -709,17 +703,16 @@ void __sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
 EXPORT_SYMBOL_GPL(__sock_recv_ts_and_drops);
 
 static inline int sock_recvmsg_nosec(struct socket *sock, struct msghdr *msg,
-                                    size_t size, int flags)
+                                    int flags)
 {
-       return sock->ops->recvmsg(sock, msg, size, flags);
+       return sock->ops->recvmsg(sock, msg, msg_data_left(msg), flags);
 }
 
-int sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
-                int flags)
+int sock_recvmsg(struct socket *sock, struct msghdr *msg, int flags)
 {
-       int err = security_socket_recvmsg(sock, msg, size, flags);
+       int err = security_socket_recvmsg(sock, msg, msg_data_left(msg), flags);
 
-       return err ?: sock_recvmsg_nosec(sock, msg, size, flags);
+       return err ?: sock_recvmsg_nosec(sock, msg, flags);
 }
 EXPORT_SYMBOL(sock_recvmsg);
 
@@ -746,7 +739,7 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
 
        iov_iter_kvec(&msg->msg_iter, READ | ITER_KVEC, vec, num, size);
        set_fs(KERNEL_DS);
-       result = sock_recvmsg(sock, msg, size, flags);
+       result = sock_recvmsg(sock, msg, flags);
        set_fs(oldfs);
        return result;
 }
@@ -796,7 +789,7 @@ static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to)
        if (!iov_iter_count(to))        /* Match SYS5 behaviour */
                return 0;
 
-       res = sock_recvmsg(sock, &msg, iov_iter_count(to), msg.msg_flags);
+       res = sock_recvmsg(sock, &msg, msg.msg_flags);
        *to = msg.msg_iter;
        return res;
 }
@@ -1046,7 +1039,7 @@ static int sock_fasync(int fd, struct file *filp, int on)
                return -EINVAL;
 
        lock_sock(sk);
-       wq = rcu_dereference_protected(sock->wq, sock_owned_by_user(sk));
+       wq = rcu_dereference_protected(sock->wq, lockdep_sock_is_held(sk));
        fasync_helper(fd, filp, on, &wq->fasync_list);
 
        if (!wq->fasync_list)
@@ -1696,7 +1689,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
        msg.msg_iocb = NULL;
        if (sock->file->f_flags & O_NONBLOCK)
                flags |= MSG_DONTWAIT;
-       err = sock_recvmsg(sock, &msg, iov_iter_count(&msg.msg_iter), flags);
+       err = sock_recvmsg(sock, &msg, flags);
 
        if (err >= 0 && addr != NULL) {
                err2 = move_addr_to_user(&address,
@@ -2073,7 +2066,7 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
        struct iovec iovstack[UIO_FASTIOV];
        struct iovec *iov = iovstack;
        unsigned long cmsg_ptr;
-       int total_len, len;
+       int len;
        ssize_t err;
 
        /* kernel mode address */
@@ -2091,7 +2084,6 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
                err = copy_msghdr_from_user(msg_sys, msg, &uaddr, &iov);
        if (err < 0)
                return err;
-       total_len = iov_iter_count(&msg_sys->msg_iter);
 
        cmsg_ptr = (unsigned long)msg_sys->msg_control;
        msg_sys->msg_flags = flags & (MSG_CMSG_CLOEXEC|MSG_CMSG_COMPAT);
@@ -2101,8 +2093,7 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
 
        if (sock->file->f_flags & O_NONBLOCK)
                flags |= MSG_DONTWAIT;
-       err = (nosec ? sock_recvmsg_nosec : sock_recvmsg)(sock, msg_sys,
-                                                         total_len, flags);
+       err = (nosec ? sock_recvmsg_nosec : sock_recvmsg)(sock, msg_sys, flags);
        if (err < 0)
                goto out_freeiov;
        len = err;
@@ -2174,7 +2165,8 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
        struct mmsghdr __user *entry;
        struct compat_mmsghdr __user *compat_entry;
        struct msghdr msg_sys;
-       struct timespec end_time;
+       struct timespec64 end_time;
+       struct timespec64 timeout64;
 
        if (timeout &&
            poll_select_set_timeout(&end_time, timeout->tv_sec,
@@ -2226,8 +2218,9 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
                        flags |= MSG_DONTWAIT;
 
                if (timeout) {
-                       ktime_get_ts(timeout);
-                       *timeout = timespec_sub(end_time, *timeout);
+                       ktime_get_ts64(&timeout64);
+                       *timeout = timespec64_to_timespec(
+                                       timespec64_sub(end_time, timeout64));
                        if (timeout->tv_sec < 0) {
                                timeout->tv_sec = timeout->tv_nsec = 0;
                                break;