Merge tag 'vfio-v5.11-rc1' of git://github.com/awilliam/linux-vfio

[linux-2.6-microblaze.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index bfef11b..33e8b6c 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -445,17 +445,15 @@ static int sock_map_fd(struct socket *sock, int flags)
 /**
  *     sock_from_file - Return the &socket bounded to @file.
  *     @file: file
- *     @err: pointer to an error code return
  *
- *     On failure returns %NULL and assigns -ENOTSOCK to @err.
+ *     On failure returns %NULL.
  */
 
-struct socket *sock_from_file(struct file *file, int *err)
+struct socket *sock_from_file(struct file *file)
 {
        if (file->f_op == &socket_file_ops)
                return file->private_data;      /* set in sock_map_fd */
 
-       *err = -ENOTSOCK;
        return NULL;
 }
 EXPORT_SYMBOL(sock_from_file);
@@ -484,9 +482,11 @@ struct socket *sockfd_lookup(int fd, int *err)
                return NULL;
        }
 
-       sock = sock_from_file(file, err);
-       if (!sock)
+       sock = sock_from_file(file);
+       if (!sock) {
+               *err = -ENOTSOCK;
                fput(file);
+       }
        return sock;
 }
 EXPORT_SYMBOL(sockfd_lookup);
@@ -498,11 +498,12 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
 
        *err = -EBADF;
        if (f.file) {
-               sock = sock_from_file(f.file, err);
+               sock = sock_from_file(f.file);
                if (likely(sock)) {
                        *fput_needed = f.flags & FDPUT_FPUT;
                        return sock;
                }
+               *err = -ENOTSOCK;
                fdput(f);
        }
        return NULL;
@@ -1693,9 +1694,11 @@ int __sys_accept4_file(struct file *file, unsigned file_flags,
        if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
                flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
 
-       sock = sock_from_file(file, &err);
-       if (!sock)
+       sock = sock_from_file(file);
+       if (!sock) {
+               err = -ENOTSOCK;
                goto out;
+       }
 
        err = -ENFILE;
        newsock = sock_alloc();
@@ -1818,9 +1821,11 @@ int __sys_connect_file(struct file *file, struct sockaddr_storage *address,
        struct socket *sock;
        int err;
 
-       sock = sock_from_file(file, &err);
-       if (!sock)
+       sock = sock_from_file(file);
+       if (!sock) {
+               err = -ENOTSOCK;
                goto out;
+       }
 
        err =
            security_socket_connect(sock, (struct sockaddr *)address, addrlen);
@@ -2170,6 +2175,17 @@ SYSCALL_DEFINE5(getsockopt, int, fd, int, level, int, optname,
  *     Shutdown a socket.
  */
 
+int __sys_shutdown_sock(struct socket *sock, int how)
+{
+       int err;
+
+       err = security_socket_shutdown(sock, how);
+       if (!err)
+               err = sock->ops->shutdown(sock, how);
+
+       return err;
+}
+
 int __sys_shutdown(int fd, int how)
 {
        int err, fput_needed;
@@ -2177,9 +2193,7 @@ int __sys_shutdown(int fd, int how)
 
        sock = sockfd_lookup_light(fd, &err, &fput_needed);
        if (sock != NULL) {
-               err = security_socket_shutdown(sock, how);
-               if (!err)
-                       err = sock->ops->shutdown(sock, how);
+               err = __sys_shutdown_sock(sock, how);
                fput_light(sock->file, fput_needed);
        }
        return err;