net sysctl: Register an empty /proc/sys/net

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 28a96af484b421ee06fffbe87358c1811693c97f..d6c1af9ae7b203745c32411a4d87dcee23b48c80 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -181,7 +181,7 @@ static DEFINE_PER_CPU(int, sockets_in_use);
  *     invalid addresses -EFAULT is returned. On a success 0 is returned.
  */
 
-int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr)
+int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr)
 {
        if (ulen < 0 || ulen > sizeof(struct sockaddr_storage))
                return -EINVAL;
@@ -209,7 +209,7 @@ int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr)
  *     specified. Zero is returned for a success.
  */
 
-static int move_addr_to_user(struct sockaddr *kaddr, int klen,
+static int move_addr_to_user(struct sockaddr_storage *kaddr, int klen,
                             void __user *uaddr, int __user *ulen)
 {
        int err;
@@ -811,9 +811,9 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
 
        sock = file->private_data;
 
-       flags = !(file->f_flags & O_NONBLOCK) ? 0 : MSG_DONTWAIT;
-       if (more)
-               flags |= MSG_MORE;
+       flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;
+       /* more is a combination of MSG_MORE and MSG_SENDPAGE_NOTLAST */
+       flags |= more;
 
        return kernel_sendpage(sock, page, offset, size, flags);
 }
@@ -1449,7 +1449,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
 
        sock = sockfd_lookup_light(fd, &err, &fput_needed);
        if (sock) {
-               err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address);
+               err = move_addr_to_kernel(umyaddr, addrlen, &address);
                if (err >= 0) {
                        err = security_socket_bind(sock,
                                                   (struct sockaddr *)&address,
@@ -1479,7 +1479,7 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
        sock = sockfd_lookup_light(fd, &err, &fput_needed);
        if (sock) {
                somaxconn = sock_net(sock->sk)->core.sysctl_somaxconn;
-               if ((unsigned)backlog > somaxconn)
+               if ((unsigned int)backlog > somaxconn)
                        backlog = somaxconn;
 
                err = security_socket_listen(sock, backlog);
@@ -1556,7 +1556,7 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
                        err = -ECONNABORTED;
                        goto out_fd;
                }
-               err = move_addr_to_user((struct sockaddr *)&address,
+               err = move_addr_to_user(&address,
                                        len, upeer_sockaddr, upeer_addrlen);
                if (err < 0)
                        goto out_fd;
@@ -1605,7 +1605,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
        sock = sockfd_lookup_light(fd, &err, &fput_needed);
        if (!sock)
                goto out;
-       err = move_addr_to_kernel(uservaddr, addrlen, (struct sockaddr *)&address);
+       err = move_addr_to_kernel(uservaddr, addrlen, &address);
        if (err < 0)
                goto out_put;
 
@@ -1645,7 +1645,7 @@ SYSCALL_DEFINE3(getsockname, int, fd, struct sockaddr __user *, usockaddr,
        err = sock->ops->getname(sock, (struct sockaddr *)&address, &len, 0);
        if (err)
                goto out_put;
-       err = move_addr_to_user((struct sockaddr *)&address, len, usockaddr, usockaddr_len);
+       err = move_addr_to_user(&address, len, usockaddr, usockaddr_len);
 
 out_put:
        fput_light(sock->file, fput_needed);
@@ -1677,7 +1677,7 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
                    sock->ops->getname(sock, (struct sockaddr *)&address, &len,
                                       1);
                if (!err)
-                       err = move_addr_to_user((struct sockaddr *)&address, len, usockaddr,
+                       err = move_addr_to_user(&address, len, usockaddr,
                                                usockaddr_len);
                fput_light(sock->file, fput_needed);
        }
@@ -1691,7 +1691,7 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
  */
 
 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
-               unsigned, flags, struct sockaddr __user *, addr,
+               unsigned int, flags, struct sockaddr __user *, addr,
                int, addr_len)
 {
        struct socket *sock;
@@ -1716,7 +1716,7 @@ SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
        msg.msg_controllen = 0;
        msg.msg_namelen = 0;
        if (addr) {
-               err = move_addr_to_kernel(addr, addr_len, (struct sockaddr *)&address);
+               err = move_addr_to_kernel(addr, addr_len, &address);
                if (err < 0)
                        goto out_put;
                msg.msg_name = (struct sockaddr *)&address;
@@ -1738,7 +1738,7 @@ out:
  */
 
 SYSCALL_DEFINE4(send, int, fd, void __user *, buff, size_t, len,
-               unsigned, flags)
+               unsigned int, flags)
 {
        return sys_sendto(fd, buff, len, flags, NULL, 0);
 }
@@ -1750,7 +1750,7 @@ SYSCALL_DEFINE4(send, int, fd, void __user *, buff, size_t, len,
  */
 
 SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
-               unsigned, flags, struct sockaddr __user *, addr,
+               unsigned int, flags, struct sockaddr __user *, addr,
                int __user *, addr_len)
 {
        struct socket *sock;
@@ -1779,7 +1779,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
        err = sock_recvmsg(sock, &msg, size, flags);
 
        if (err >= 0 && addr != NULL) {
-               err2 = move_addr_to_user((struct sockaddr *)&address,
+               err2 = move_addr_to_user(&address,
                                         msg.msg_namelen, addr, addr_len);
                if (err2 < 0)
                        err = err2;
@@ -1795,7 +1795,7 @@ out:
  */
 
 asmlinkage long sys_recv(int fd, void __user *ubuf, size_t size,
-                        unsigned flags)
+                        unsigned int flags)
 {
        return sys_recvfrom(fd, ubuf, size, flags, NULL, NULL);
 }
@@ -1897,7 +1897,7 @@ struct used_address {
 };
 
 static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
-                        struct msghdr *msg_sys, unsigned flags,
+                        struct msghdr *msg_sys, unsigned int flags,
                         struct used_address *used_address)
 {
        struct compat_msghdr __user *msg_compat =
@@ -1933,13 +1933,9 @@ static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
 
        /* This will also move the address data into kernel space */
        if (MSG_CMSG_COMPAT & flags) {
-               err = verify_compat_iovec(msg_sys, iov,
-                                         (struct sockaddr *)&address,
-                                         VERIFY_READ);
+               err = verify_compat_iovec(msg_sys, iov, &address, VERIFY_READ);
        } else
-               err = verify_iovec(msg_sys, iov,
-                                  (struct sockaddr *)&address,
-                                  VERIFY_READ);
+               err = verify_iovec(msg_sys, iov, &address, VERIFY_READ);
        if (err < 0)
                goto out_freeiov;
        total_len = err;
@@ -2018,7 +2014,7 @@ out:
  *     BSD sendmsg interface
  */
 
-SYSCALL_DEFINE3(sendmsg, int, fd, struct msghdr __user *, msg, unsigned, flags)
+SYSCALL_DEFINE3(sendmsg, int, fd, struct msghdr __user *, msg, unsigned int, flags)
 {
        int fput_needed, err;
        struct msghdr msg_sys;
@@ -2100,7 +2096,7 @@ SYSCALL_DEFINE4(sendmmsg, int, fd, struct mmsghdr __user *, mmsg,
 }
 
 static int __sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
-                        struct msghdr *msg_sys, unsigned flags, int nosec)
+                        struct msghdr *msg_sys, unsigned int flags, int nosec)
 {
        struct compat_msghdr __user *msg_compat =
            (struct compat_msghdr __user *)msg;
@@ -2143,13 +2139,9 @@ static int __sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
        uaddr = (__force void __user *)msg_sys->msg_name;
        uaddr_len = COMPAT_NAMELEN(msg);
        if (MSG_CMSG_COMPAT & flags) {
-               err = verify_compat_iovec(msg_sys, iov,
-                                         (struct sockaddr *)&addr,
-                                         VERIFY_WRITE);
+               err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
        } else
-               err = verify_iovec(msg_sys, iov,
-                                  (struct sockaddr *)&addr,
-                                  VERIFY_WRITE);
+               err = verify_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
        if (err < 0)
                goto out_freeiov;
        total_len = err;
@@ -2166,7 +2158,7 @@ static int __sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
        len = err;
 
        if (uaddr != NULL) {
-               err = move_addr_to_user((struct sockaddr *)&addr,
+               err = move_addr_to_user(&addr,
                                        msg_sys->msg_namelen, uaddr,
                                        uaddr_len);
                if (err < 0)
@@ -2600,7 +2592,7 @@ void socket_seq_show(struct seq_file *seq)
 
 #ifdef CONFIG_COMPAT
 static int do_siocgstamp(struct net *net, struct socket *sock,
-                        unsigned int cmd, struct compat_timeval __user *up)
+                        unsigned int cmd, void __user *up)
 {
        mm_segment_t old_fs = get_fs();
        struct timeval ktv;
@@ -2609,15 +2601,14 @@ static int do_siocgstamp(struct net *net, struct socket *sock,
        set_fs(KERNEL_DS);
        err = sock_do_ioctl(net, sock, cmd, (unsigned long)&ktv);
        set_fs(old_fs);
-       if (!err) {
-               err = put_user(ktv.tv_sec, &up->tv_sec);
-               err |= __put_user(ktv.tv_usec, &up->tv_usec);
-       }
+       if (!err)
+               err = compat_put_timeval(up, &ktv);
+
        return err;
 }
 
 static int do_siocgstampns(struct net *net, struct socket *sock,
-                        unsigned int cmd, struct compat_timespec __user *up)
+                          unsigned int cmd, void __user *up)
 {
        mm_segment_t old_fs = get_fs();
        struct timespec kts;
@@ -2626,10 +2617,9 @@ static int do_siocgstampns(struct net *net, struct socket *sock,
        set_fs(KERNEL_DS);
        err = sock_do_ioctl(net, sock, cmd, (unsigned long)&kts);
        set_fs(old_fs);
-       if (!err) {
-               err = put_user(kts.tv_sec, &up->tv_sec);
-               err |= __put_user(kts.tv_nsec, &up->tv_nsec);
-       }
+       if (!err)
+               err = compat_put_timespec(up, &kts);
+
        return err;
 }
 
@@ -3233,7 +3223,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,
        return -ENOIOCTLCMD;
 }
 
-static long compat_sock_ioctl(struct file *file, unsigned cmd,
+static long compat_sock_ioctl(struct file *file, unsigned int cmd,
                              unsigned long arg)
 {
        struct socket *sock = file->private_data;