1 files changed, 26 insertions, 25 deletions

diff --git a/net/socket.c b/net/socket.c
index 08847c3b8c39..3d1948d27a25 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -104,7 +104,6 @@
 #include <linux/ipv6_route.h>
 #include <linux/route.h>
 #include <linux/sockios.h>
-#include <linux/atalk.h>
 #include <net/busy_poll.h>
 #include <linux/errqueue.h>
 
@@ -234,7 +233,7 @@ static int move_addr_to_user(struct sockaddr_storage *kaddr, int klen,
         return __put_user(klen, ulen);
 }
 
-static struct kmem_cache *sock_inode_cachep __read_mostly;
+static struct kmem_cache *sock_inode_cachep __ro_after_init;
 
 static struct inode *sock_alloc_inode(struct super_block *sb)
 {
@@ -991,10 +990,11 @@ static long sock_do_ioctl(struct net *net, struct socket *sock,
  *      what to do with it - that's up to the protocol still.
  */
 
-static struct ns_common *get_net_ns(struct ns_common *ns)
+struct ns_common *get_net_ns(struct ns_common *ns)
 {
         return &get_net(container_of(ns, struct net, ns))->ns;
 }
+EXPORT_SYMBOL_GPL(get_net_ns);
 
 static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 {
@@ -1573,8 +1573,9 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
                 goto out_fd;
 
         if (upeer_sockaddr) {
-                if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
-                                          &len, 2) < 0) {
+                len = newsock->ops->getname(newsock,
+                                        (struct sockaddr *)&address, 2);
+                if (len < 0) {
                         err = -ECONNABORTED;
                         goto out_fd;
                 }
@@ -1654,7 +1655,7 @@ SYSCALL_DEFINE3(getsockname, int, fd, struct sockaddr __user *, usockaddr,
 {
         struct socket *sock;
         struct sockaddr_storage address;
-        int len, err, fput_needed;
+        int err, fput_needed;
 
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (!sock)
@@ -1664,10 +1665,11 @@ SYSCALL_DEFINE3(getsockname, int, fd, struct sockaddr __user *, usockaddr,
         if (err)
                 goto out_put;
 
-        err = sock->ops->getname(sock, (struct sockaddr *)&address, &len, 0);
-        if (err)
+        err = sock->ops->getname(sock, (struct sockaddr *)&address, 0);
+        if (err < 0)
                 goto out_put;
-        err = move_addr_to_user(&address, len, usockaddr, usockaddr_len);
+        /* "err" is actually length in this case */
+        err = move_addr_to_user(&address, err, usockaddr, usockaddr_len);
 
 out_put:
         fput_light(sock->file, fput_needed);
@@ -1685,7 +1687,7 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
 {
         struct socket *sock;
         struct sockaddr_storage address;
-        int len, err, fput_needed;
+        int err, fput_needed;
 
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (sock != NULL) {
@@ -1695,11 +1697,10 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
                         return err;
                 }
 
-                err =
-                    sock->ops->getname(sock, (struct sockaddr *)&address, &len,
-                                       1);
-                if (!err)
-                        err = move_addr_to_user(&address, len, usockaddr,
+                err = sock->ops->getname(sock, (struct sockaddr *)&address, 1);
+                if (err >= 0)
+                        /* "err" is actually length in this case */
+                        err = move_addr_to_user(&address, err, usockaddr,
                                                 usockaddr_len);
                 fput_light(sock->file, fput_needed);
         }
@@ -2288,10 +2289,12 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
         if (!sock)
                 return err;
 
-        err = sock_error(sock->sk);
-        if (err) {
-                datagrams = err;
-                goto out_put;
+        if (likely(!(flags & MSG_ERRQUEUE))) {
+                err = sock_error(sock->sk);
+                if (err) {
+                        datagrams = err;
+                        goto out_put;
+                }
         }
 
         entry = mmsg;
@@ -3171,17 +3174,15 @@ int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen,
 }
 EXPORT_SYMBOL(kernel_connect);
 
-int kernel_getsockname(struct socket *sock, struct sockaddr *addr,
-                         int *addrlen)
+int kernel_getsockname(struct socket *sock, struct sockaddr *addr)
 {
-        return sock->ops->getname(sock, addr, addrlen, 0);
+        return sock->ops->getname(sock, addr, 0);
 }
 EXPORT_SYMBOL(kernel_getsockname);
 
-int kernel_getpeername(struct socket *sock, struct sockaddr *addr,
-                         int *addrlen)
+int kernel_getpeername(struct socket *sock, struct sockaddr *addr)
 {
-        return sock->ops->getname(sock, addr, addrlen, 1);
+        return sock->ops->getname(sock, addr, 1);
 }
 EXPORT_SYMBOL(kernel_getpeername);