Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

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

diff --git a/net/socket.c b/net/socket.c
index 2d752e9..af57d85 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -1445,6 +1445,13 @@ int __sys_socketpair(int family, int type, int protocol, int __user *usockvec)
                goto out;
        }
 
+       err = security_socket_socketpair(sock1, sock2);
+       if (unlikely(err)) {
+               sock_release(sock2);
+               sock_release(sock1);
+               goto out;
+       }
+
        err = sock1->ops->socketpair(sock1, sock2);
        if (unlikely(err < 0)) {
                sock_release(sock2);