Merge branch 'master' into upstream

1 files changed, 586 insertions, 442 deletions

diff --git a/net/socket.c b/net/socket.c
index 6d261bf206fc..1bc4167e0da8 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -42,7 +42,7 @@
  *              Andi Kleen      :       Some small cleanups, optimizations,
  *                                      and fixed a copy_from_user() bug.
  *              Tigran Aivazian :       sys_send(args) calls sys_sendto(args, NULL, 0)
- *              Tigran Aivazian :       Made listen(2) backlog sanity checks 
+ *              Tigran Aivazian :       Made listen(2) backlog sanity checks
  *                                      protocol-independent
  *
  *
@@ -53,17 +53,17 @@
  *
  *
  *      This module is effectively the top level interface to the BSD socket
- *      paradigm. 
+ *      paradigm.
  *
  *      Based upon Swansea University Computer Society NET3.039
  */
 
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/socket.h>
 #include <linux/file.h>
 #include <linux/net.h>
 #include <linux/interrupt.h>
+#include <linux/rcupdate.h>
 #include <linux/netdevice.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -96,25 +96,24 @@
 
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
 static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
-                         size_t size, loff_t pos);
+                             size_t size, loff_t pos);
 static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *buf,
-                          size_t size, loff_t pos);
-static int sock_mmap(struct file *file, struct vm_area_struct * vma);
+                              size_t size, loff_t pos);
+static int sock_mmap(struct file *file, struct vm_area_struct *vma);
 
 static int sock_close(struct inode *inode, struct file *file);
 static unsigned int sock_poll(struct file *file,
                               struct poll_table_struct *wait);
-static long sock_ioctl(struct file *file,
-                      unsigned int cmd, unsigned long arg);
+static long sock_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 #ifdef CONFIG_COMPAT
 static long compat_sock_ioctl(struct file *file,
-                      unsigned int cmd, unsigned long arg);
+                              unsigned int cmd, unsigned long arg);
 #endif
 static int sock_fasync(int fd, struct file *filp, int on);
 static ssize_t sock_readv(struct file *file, const struct iovec *vector,
                           unsigned long count, loff_t *ppos);
 static ssize_t sock_writev(struct file *file, const struct iovec *vector,
-                          unsigned long count, loff_t *ppos);
+                           unsigned long count, loff_t *ppos);
 static ssize_t sock_sendpage(struct file *file, struct page *page,
                              int offset, size_t size, loff_t *ppos, int more);
 
@@ -147,52 +146,8 @@ static struct file_operations socket_file_ops = {
  *      The protocol list. Each protocol is registered in here.
  */
 
-static struct net_proto_family *net_families[NPROTO];
-
-#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
-static atomic_t net_family_lockct = ATOMIC_INIT(0);
 static DEFINE_SPINLOCK(net_family_lock);
-
-/* The strategy is: modifications net_family vector are short, do not
-   sleep and veeery rare, but read access should be free of any exclusive
-   locks.
- */
-
-static void net_family_write_lock(void)
-{
-        spin_lock(&net_family_lock);
-        while (atomic_read(&net_family_lockct) != 0) {
-                spin_unlock(&net_family_lock);
-
-                yield();
-
-                spin_lock(&net_family_lock);
-        }
-}
-
-static __inline__ void net_family_write_unlock(void)
-{
-        spin_unlock(&net_family_lock);
-}
-
-static __inline__ void net_family_read_lock(void)
-{
-        atomic_inc(&net_family_lockct);
-        spin_unlock_wait(&net_family_lock);
-}
-
-static __inline__ void net_family_read_unlock(void)
-{
-        atomic_dec(&net_family_lockct);
-}
-
-#else
-#define net_family_write_lock() do { } while(0)
-#define net_family_write_unlock() do { } while(0)
-#define net_family_read_lock() do { } while(0)
-#define net_family_read_unlock() do { } while(0)
-#endif
-
+static const struct net_proto_family *net_families[NPROTO] __read_mostly;
 
 /*
  *      Statistics counters of the socket lists
@@ -201,19 +156,20 @@ static __inline__ void net_family_read_unlock(void)
 static DEFINE_PER_CPU(int, sockets_in_use) = 0;
 
 /*
- *      Support routines. Move socket addresses back and forth across the kernel/user
- *      divide and look after the messy bits.
+ * Support routines.
+ * Move socket addresses back and forth across the kernel/user
+ * divide and look after the messy bits.
  */
 
-#define MAX_SOCK_ADDR   128             /* 108 for Unix domain - 
+#define MAX_SOCK_ADDR   128             /* 108 for Unix domain -
                                            16 for IP, 16 for IPX,
                                            24 for IPv6,
-                                           about 80 for AX.25 
+                                           about 80 for AX.25
                                            must be at least one bigger than
                                            the AF_UNIX size (see net/unix/af_unix.c
-                                           :unix_mkname()).  
+                                           :unix_mkname()).
                                          */
-                                         
+
 /**
  *      move_addr_to_kernel     -       copy a socket address into kernel space
  *      @uaddr: Address in user space
@@ -227,11 +183,11 @@ static DEFINE_PER_CPU(int, sockets_in_use) = 0;
 
 int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr)
 {
-        if(ulen<0||ulen>MAX_SOCK_ADDR)
+        if (ulen < 0 || ulen > MAX_SOCK_ADDR)
                 return -EINVAL;
-        if(ulen==0)
+        if (ulen == 0)
                 return 0;
-        if(copy_from_user(kaddr,uaddr,ulen))
+        if (copy_from_user(kaddr, uaddr, ulen))
                 return -EFAULT;
         return audit_sockaddr(ulen, kaddr);
 }
@@ -252,51 +208,52 @@ int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr)
  *      length of the data is written over the length limit the user
  *      specified. Zero is returned for a success.
  */
- 
-int move_addr_to_user(void *kaddr, int klen, void __user *uaddr, int __user *ulen)
+
+int move_addr_to_user(void *kaddr, int klen, void __user *uaddr,
+                      int __user *ulen)
 {
         int err;
         int len;
 
-        if((err=get_user(len, ulen)))
+        err = get_user(len, ulen);
+        if (err)
                 return err;
-        if(len>klen)
-                len=klen;
-        if(len<0 || len> MAX_SOCK_ADDR)
+        if (len > klen)
+                len = klen;
+        if (len < 0 || len > MAX_SOCK_ADDR)
                 return -EINVAL;
-        if(len)
-        {
+        if (len) {
                 if (audit_sockaddr(klen, kaddr))
                         return -ENOMEM;
-                if(copy_to_user(uaddr,kaddr,len))
+                if (copy_to_user(uaddr, kaddr, len))
                         return -EFAULT;
         }
         /*
-         *      "fromlen shall refer to the value before truncation.."
-         *                      1003.1g
+         *      "fromlen shall refer to the value before truncation.."
+         *                      1003.1g
          */
         return __put_user(klen, ulen);
 }
 
 #define SOCKFS_MAGIC 0x534F434B
 
-static kmem_cache_t * sock_inode_cachep __read_mostly;
+static kmem_cache_t *sock_inode_cachep __read_mostly;
 
 static struct inode *sock_alloc_inode(struct super_block *sb)
 {
         struct socket_alloc *ei;
-        ei = (struct socket_alloc *)kmem_cache_alloc(sock_inode_cachep, SLAB_KERNEL);
+
+        ei = kmem_cache_alloc(sock_inode_cachep, SLAB_KERNEL);
         if (!ei)
                 return NULL;
         init_waitqueue_head(&ei->socket.wait);
-        
+
         ei->socket.fasync_list = NULL;
         ei->socket.state = SS_UNCONNECTED;
         ei->socket.flags = 0;
         ei->socket.ops = NULL;
         ei->socket.sk = NULL;
         ei->socket.file = NULL;
-        ei->socket.flags = 0;
 
         return &ei->vfs_inode;
 }
@@ -307,22 +264,25 @@ static void sock_destroy_inode(struct inode *inode)
                         container_of(inode, struct socket_alloc, vfs_inode));
 }
 
-static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
+static void init_once(void *foo, kmem_cache_t *cachep, unsigned long flags)
 {
-        struct socket_alloc *ei = (struct socket_alloc *) foo;
+        struct socket_alloc *ei = (struct socket_alloc *)foo;
 
-        if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-            SLAB_CTOR_CONSTRUCTOR)
+        if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR))
+            == SLAB_CTOR_CONSTRUCTOR)
                 inode_init_once(&ei->vfs_inode);
 }
- 
+
 static int init_inodecache(void)
 {
         sock_inode_cachep = kmem_cache_create("sock_inode_cache",
-                                sizeof(struct socket_alloc),
-                                0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT|
-                                        SLAB_MEM_SPREAD),
-                                init_once, NULL);
+                                              sizeof(struct socket_alloc),
+                                              0,
+                                              (SLAB_HWCACHE_ALIGN |
+                                               SLAB_RECLAIM_ACCOUNT |
+                                               SLAB_MEM_SPREAD),
+                                              init_once,
+                                              NULL);
         if (sock_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
@@ -335,7 +295,8 @@ static struct super_operations sockfs_ops = {
 };
 
 static int sockfs_get_sb(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data, struct vfsmount *mnt)
+                         int flags, const char *dev_name, void *data,
+                         struct vfsmount *mnt)
 {
         return get_sb_pseudo(fs_type, "socket:", &sockfs_ops, SOCKFS_MAGIC,
                              mnt);
@@ -348,12 +309,13 @@ static struct file_system_type sock_fs_type = {
         .get_sb =       sockfs_get_sb,
         .kill_sb =      kill_anon_super,
 };
+
 static int sockfs_delete_dentry(struct dentry *dentry)
 {
         return 1;
 }
 static struct dentry_operations sockfs_dentry_operations = {
-        .d_delete =     sockfs_delete_dentry,
+        .d_delete = sockfs_delete_dentry,
 };
 
 /*
@@ -477,10 +439,12 @@ struct socket *sockfd_lookup(int fd, int *err)
         struct file *file;
         struct socket *sock;
 
-        if (!(file = fget(fd))) {
+        file = fget(fd);
+        if (!file) {
                 *err = -EBADF;
                 return NULL;
         }
+
         sock = sock_from_file(file, err);
         if (!sock)
                 fput(file);
@@ -505,7 +469,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
 
 /**
  *      sock_alloc      -       allocate a socket
- *      
+ *
  *      Allocate a new inode and socket object. The two are bound together
  *      and initialised. The socket is then returned. If we are out of inodes
  *      NULL is returned.
@@ -513,8 +477,8 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
 
 static struct socket *sock_alloc(void)
 {
-        struct inode * inode;
-        struct socket * sock;
+        struct inode *inode;
+        struct socket *sock;
 
         inode = new_inode(sock_mnt->mnt_sb);
         if (!inode)
@@ -522,7 +486,7 @@ static struct socket *sock_alloc(void)
 
         sock = SOCKET_I(inode);
 
-        inode->i_mode = S_IFSOCK|S_IRWXUGO;
+        inode->i_mode = S_IFSOCK | S_IRWXUGO;
         inode->i_uid = current->fsuid;
         inode->i_gid = current->fsgid;
 
@@ -536,7 +500,7 @@ static struct socket *sock_alloc(void)
  *      a back door. Remember to keep it shut otherwise you'll let the
  *      creepy crawlies in.
  */
-  
+
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
 {
         return -ENXIO;
@@ -553,9 +517,9 @@ const struct file_operations bad_sock_fops = {
  *
  *      The socket is released from the protocol stack if it has a release
  *      callback, and the inode is then released if the socket is bound to
- *      an inode not a file. 
+ *      an inode not a file.
  */
- 
+
 void sock_release(struct socket *sock)
 {
         if (sock->ops) {
@@ -575,10 +539,10 @@ void sock_release(struct socket *sock)
                 iput(SOCK_INODE(sock));
                 return;
         }
-        sock->file=NULL;
+        sock->file = NULL;
 }
 
-static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
+static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock,
                                  struct msghdr *msg, size_t size)
 {
         struct sock_iocb *si = kiocb_to_siocb(iocb);
@@ -621,14 +585,14 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg,
          * the following is safe, since for compiler definitions of kvec and
          * iovec are identical, yielding the same in-core layout and alignment
          */
-        msg->msg_iov = (struct iovec *)vec,
+        msg->msg_iov = (struct iovec *)vec;
         msg->msg_iovlen = num;
         result = sock_sendmsg(sock, msg, size);
         set_fs(oldfs);
         return result;
 }
 
-static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, 
+static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
                                  struct msghdr *msg, size_t size, int flags)
 {
         int err;
@@ -647,14 +611,14 @@ static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock,
         return sock->ops->recvmsg(iocb, sock, msg, size, flags);
 }
 
-int sock_recvmsg(struct socket *sock, struct msghdr *msg, 
+int sock_recvmsg(struct socket *sock, struct msghdr *msg,
                  size_t size, int flags)
 {
         struct kiocb iocb;
         struct sock_iocb siocb;
         int ret;
 
-        init_sync_kiocb(&iocb, NULL);
+        init_sync_kiocb(&iocb, NULL);
         iocb.private = &siocb;
         ret = __sock_recvmsg(&iocb, sock, msg, size, flags);
         if (-EIOCBQUEUED == ret)
@@ -662,9 +626,8 @@ int sock_recvmsg(struct socket *sock, struct msghdr *msg,
         return ret;
 }
 
-int kernel_recvmsg(struct socket *sock, struct msghdr *msg, 
-                   struct kvec *vec, size_t num,
-                   size_t size, int flags)
+int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
+                   struct kvec *vec, size_t num, size_t size, int flags)
 {
         mm_segment_t oldfs = get_fs();
         int result;
@@ -674,8 +637,7 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg,
          * the following is safe, since for compiler definitions of kvec and
          * iovec are identical, yielding the same in-core layout and alignment
          */
-        msg->msg_iov = (struct iovec *)vec,
-        msg->msg_iovlen = num;
+        msg->msg_iov = (struct iovec *)vec, msg->msg_iovlen = num;
         result = sock_recvmsg(sock, msg, size, flags);
         set_fs(oldfs);
         return result;
@@ -702,7 +664,8 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
 }
 
 static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,
-                char __user *ubuf, size_t size, struct sock_iocb *siocb)
+                                         char __user *ubuf, size_t size,
+                                         struct sock_iocb *siocb)
 {
         if (!is_sync_kiocb(iocb)) {
                 siocb = kmalloc(sizeof(*siocb), GFP_KERNEL);
@@ -720,20 +683,21 @@ static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,
 }
 
 static ssize_t do_sock_read(struct msghdr *msg, struct kiocb *iocb,
-                struct file *file, struct iovec *iov, unsigned long nr_segs)
+                            struct file *file, struct iovec *iov,
+                            unsigned long nr_segs)
 {
         struct socket *sock = file->private_data;
         size_t size = 0;
         int i;
 
-        for (i = 0 ; i < nr_segs ; i++)
-                size += iov[i].iov_len;
+        for (i = 0; i < nr_segs; i++)
+                size += iov[i].iov_len;
 
         msg->msg_name = NULL;
         msg->msg_namelen = 0;
         msg->msg_control = NULL;
         msg->msg_controllen = 0;
-        msg->msg_iov = (struct iovec *) iov;
+        msg->msg_iov = (struct iovec *)iov;
         msg->msg_iovlen = nr_segs;
         msg->msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;
 
@@ -748,7 +712,7 @@ static ssize_t sock_readv(struct file *file, const struct iovec *iov,
         struct msghdr msg;
         int ret;
 
-        init_sync_kiocb(&iocb, NULL);
+        init_sync_kiocb(&iocb, NULL);
         iocb.private = &siocb;
 
         ret = do_sock_read(&msg, &iocb, file, (struct iovec *)iov, nr_segs);
@@ -758,7 +722,7 @@ static ssize_t sock_readv(struct file *file, const struct iovec *iov,
 }
 
 static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf,
-                         size_t count, loff_t pos)
+                             size_t count, loff_t pos)
 {
         struct sock_iocb siocb, *x;
 
@@ -771,24 +735,25 @@ static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf,
         if (!x)
                 return -ENOMEM;
         return do_sock_read(&x->async_msg, iocb, iocb->ki_filp,
-                        &x->async_iov, 1);
+                            &x->async_iov, 1);
 }
 
 static ssize_t do_sock_write(struct msghdr *msg, struct kiocb *iocb,
-                struct file *file, struct iovec *iov, unsigned long nr_segs)
+                             struct file *file, struct iovec *iov,
+                             unsigned long nr_segs)
 {
         struct socket *sock = file->private_data;
         size_t size = 0;
         int i;
 
-        for (i = 0 ; i < nr_segs ; i++)
-                size += iov[i].iov_len;
+        for (i = 0; i < nr_segs; i++)
+                size += iov[i].iov_len;
 
         msg->msg_name = NULL;
         msg->msg_namelen = 0;
         msg->msg_control = NULL;
         msg->msg_controllen = 0;
-        msg->msg_iov = (struct iovec *) iov;
+        msg->msg_iov = (struct iovec *)iov;
         msg->msg_iovlen = nr_segs;
         msg->msg_flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0;
         if (sock->type == SOCK_SEQPACKET)
@@ -815,7 +780,7 @@ static ssize_t sock_writev(struct file *file, const struct iovec *iov,
 }
 
 static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
-                          size_t count, loff_t pos)
+                              size_t count, loff_t pos)
 {
         struct sock_iocb siocb, *x;
 
@@ -829,46 +794,48 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
                 return -ENOMEM;
 
         return do_sock_write(&x->async_msg, iocb, iocb->ki_filp,
-                        &x->async_iov, 1);
+                             &x->async_iov, 1);
 }
 
-
 /*
  * Atomic setting of ioctl hooks to avoid race
  * with module unload.
  */
 
 static DEFINE_MUTEX(br_ioctl_mutex);
-static int (*br_ioctl_hook)(unsigned int cmd, void __user *arg) = NULL;
+static int (*br_ioctl_hook) (unsigned int cmd, void __user *arg) = NULL;
 
-void brioctl_set(int (*hook)(unsigned int, void __user *))
+void brioctl_set(int (*hook) (unsigned int, void __user *))
 {
         mutex_lock(&br_ioctl_mutex);
         br_ioctl_hook = hook;
         mutex_unlock(&br_ioctl_mutex);
 }
+
 EXPORT_SYMBOL(brioctl_set);
 
 static DEFINE_MUTEX(vlan_ioctl_mutex);
-static int (*vlan_ioctl_hook)(void __user *arg);
+static int (*vlan_ioctl_hook) (void __user *arg);
 
-void vlan_ioctl_set(int (*hook)(void __user *))
+void vlan_ioctl_set(int (*hook) (void __user *))
 {
         mutex_lock(&vlan_ioctl_mutex);
         vlan_ioctl_hook = hook;
         mutex_unlock(&vlan_ioctl_mutex);
 }
+
 EXPORT_SYMBOL(vlan_ioctl_set);
 
 static DEFINE_MUTEX(dlci_ioctl_mutex);
-static int (*dlci_ioctl_hook)(unsigned int, void __user *);
+static int (*dlci_ioctl_hook) (unsigned int, void __user *);
 
-void dlci_ioctl_set(int (*hook)(unsigned int, void __user *))
+void dlci_ioctl_set(int (*hook) (unsigned int, void __user *))
 {
         mutex_lock(&dlci_ioctl_mutex);
         dlci_ioctl_hook = hook;
         mutex_unlock(&dlci_ioctl_mutex);
 }
+
 EXPORT_SYMBOL(dlci_ioctl_set);
 
 /*
@@ -890,8 +857,8 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
         if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
                 err = dev_ioctl(cmd, argp);
         } else
-#endif  /* CONFIG_WIRELESS_EXT */
-        switch (cmd) {
+#endif                          /* CONFIG_WIRELESS_EXT */
+                switch (cmd) {
                 case FIOSETOWN:
                 case SIOCSPGRP:
                         err = -EFAULT;
@@ -901,7 +868,8 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                         break;
                 case FIOGETOWN:
                 case SIOCGPGRP:
-                        err = put_user(sock->file->f_owner.pid, (int __user *)argp);
+                        err = put_user(sock->file->f_owner.pid,
+                                       (int __user *)argp);
                         break;
                 case SIOCGIFBR:
                 case SIOCSIFBR:
@@ -912,7 +880,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                                 request_module("bridge");
 
                         mutex_lock(&br_ioctl_mutex);
-                        if (br_ioctl_hook) 
+                        if (br_ioctl_hook)
                                 err = br_ioctl_hook(cmd, argp);
                         mutex_unlock(&br_ioctl_mutex);
                         break;
@@ -929,7 +897,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                         break;
                 case SIOCGIFDIVERT:
                 case SIOCSIFDIVERT:
-                /* Convert this to call through a hook */
+                        /* Convert this to call through a hook */
                         err = divert_ioctl(cmd, argp);
                         break;
                 case SIOCADDDLCI:
@@ -954,7 +922,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                         if (err == -ENOIOCTLCMD)
                                 err = dev_ioctl(cmd, argp);
                         break;
-        }
+                }
         return err;
 }
 
@@ -962,7 +930,7 @@ int sock_create_lite(int family, int type, int protocol, struct socket **res)
 {
         int err;
         struct socket *sock = NULL;
-        
+
         err = security_socket_create(family, type, protocol, 1);
         if (err)
                 goto out;
@@ -973,26 +941,33 @@ int sock_create_lite(int family, int type, int protocol, struct socket **res)
                 goto out;
         }
 
-        security_socket_post_create(sock, family, type, protocol, 1);
         sock->type = type;
+        err = security_socket_post_create(sock, family, type, protocol, 1);
+        if (err)
+                goto out_release;
+
 out:
         *res = sock;
         return err;
+out_release:
+        sock_release(sock);
+        sock = NULL;
+        goto out;
 }
 
 /* No kernel lock held - perfect */
-static unsigned int sock_poll(struct file *file, poll_table * wait)
+static unsigned int sock_poll(struct file *file, poll_table *wait)
 {
         struct socket *sock;
 
         /*
-         *      We can't return errors to poll, so it's either yes or no. 
+         *      We can't return errors to poll, so it's either yes or no.
          */
         sock = file->private_data;
         return sock->ops->poll(file, sock, wait);
 }
 
-static int sock_mmap(struct file * file, struct vm_area_struct * vma)
+static int sock_mmap(struct file *file, struct vm_area_struct *vma)
 {
         struct socket *sock = file->private_data;
 
@@ -1002,12 +977,11 @@ static int sock_mmap(struct file * file, struct vm_area_struct * vma)
 static int sock_close(struct inode *inode, struct file *filp)
 {
         /*
-         *      It was possible the inode is NULL we were 
-         *      closing an unfinished socket. 
+         *      It was possible the inode is NULL we were
+         *      closing an unfinished socket.
          */
 
-        if (!inode)
-        {
+        if (!inode) {
                 printk(KERN_DEBUG "sock_close: NULL inode\n");
                 return 0;
         }
@@ -1033,57 +1007,52 @@ static int sock_close(struct inode *inode, struct file *filp)
 
 static int sock_fasync(int fd, struct file *filp, int on)
 {
-        struct fasync_struct *fa, *fna=NULL, **prev;
+        struct fasync_struct *fa, *fna = NULL, **prev;
         struct socket *sock;
         struct sock *sk;
 
-        if (on)
-        {
+        if (on) {
                 fna = kmalloc(sizeof(struct fasync_struct), GFP_KERNEL);
-                if(fna==NULL)
+                if (fna == NULL)
                         return -ENOMEM;
         }
 
         sock = filp->private_data;
 
-        if ((sk=sock->sk) == NULL) {
+        sk = sock->sk;
+        if (sk == NULL) {
                 kfree(fna);
                 return -EINVAL;
         }
 
         lock_sock(sk);
 
-        prev=&(sock->fasync_list);
+        prev = &(sock->fasync_list);
 
-        for (fa=*prev; fa!=NULL; prev=&fa->fa_next,fa=*prev)
-                if (fa->fa_file==filp)
+        for (fa = *prev; fa != NULL; prev = &fa->fa_next, fa = *prev)
+                if (fa->fa_file == filp)
                         break;
 
-        if(on)
-        {
-                if(fa!=NULL)
-                {
+        if (on) {
+                if (fa != NULL) {
                         write_lock_bh(&sk->sk_callback_lock);
-                        fa->fa_fd=fd;
+                        fa->fa_fd = fd;
                         write_unlock_bh(&sk->sk_callback_lock);
 
                         kfree(fna);
                         goto out;
                 }
-                fna->fa_file=filp;
-                fna->fa_fd=fd;
-                fna->magic=FASYNC_MAGIC;
-                fna->fa_next=sock->fasync_list;
+                fna->fa_file = filp;
+                fna->fa_fd = fd;
+                fna->magic = FASYNC_MAGIC;
+                fna->fa_next = sock->fasync_list;
                 write_lock_bh(&sk->sk_callback_lock);
-                sock->fasync_list=fna;
+                sock->fasync_list = fna;
                 write_unlock_bh(&sk->sk_callback_lock);
-        }
-        else
-        {
-                if (fa!=NULL)
-                {
+        } else {
+                if (fa != NULL) {
                         write_lock_bh(&sk->sk_callback_lock);
-                        *prev=fa->fa_next;
+                        *prev = fa->fa_next;
                         write_unlock_bh(&sk->sk_callback_lock);
                         kfree(fa);
                 }
@@ -1100,10 +1069,9 @@ int sock_wake_async(struct socket *sock, int how, int band)
 {
         if (!sock || !sock->fasync_list)
                 return -1;
-        switch (how)
-        {
+        switch (how) {
         case 1:
-                
+
                 if (test_bit(SOCK_ASYNC_WAITDATA, &sock->flags))
                         break;
                 goto call_kill;
@@ -1112,7 +1080,7 @@ int sock_wake_async(struct socket *sock, int how, int band)
                         break;
                 /* fall through */
         case 0:
-        call_kill:
+call_kill:
                 __kill_fasync(sock->fasync_list, SIGIO, band);
                 break;
         case 3:
@@ -1121,13 +1089,15 @@ int sock_wake_async(struct socket *sock, int how, int band)
         return 0;
 }
 
-static int __sock_create(int family, int type, int protocol, struct socket **res, int kern)
+static int __sock_create(int family, int type, int protocol,
+                         struct socket **res, int kern)
 {
         int err;
         struct socket *sock;
+        const struct net_proto_family *pf;
 
         /*
-         *      Check protocol is in range
+         *      Check protocol is in range
          */
         if (family < 0 || family >= NPROTO)
                 return -EAFNOSUPPORT;
@@ -1140,10 +1110,11 @@ static int __sock_create(int family, int type, int protocol, struct socket **res
            deadlock in module load.
          */
         if (family == PF_INET && type == SOCK_PACKET) {
-                static int warned; 
+                static int warned;
                 if (!warned) {
                         warned = 1;
-                        printk(KERN_INFO "%s uses obsolete (PF_INET,SOCK_PACKET)\n", current->comm);
+                        printk(KERN_INFO "%s uses obsolete (PF_INET,SOCK_PACKET)\n",
+                               current->comm);
                 }
                 family = PF_PACKET;
         }
@@ -1151,79 +1122,84 @@ static int __sock_create(int family, int type, int protocol, struct socket **res
         err = security_socket_create(family, type, protocol, kern);
         if (err)
                 return err;
-                
+
+        /*
+         *      Allocate the socket and allow the family to set things up. if
+         *      the protocol is 0, the family is instructed to select an appropriate
+         *      default.
+         */
+        sock = sock_alloc();
+        if (!sock) {
+                if (net_ratelimit())
+                        printk(KERN_WARNING "socket: no more sockets\n");
+                return -ENFILE; /* Not exactly a match, but its the
+                                   closest posix thing */
+        }
+
+        sock->type = type;
+
 #if defined(CONFIG_KMOD)
-        /* Attempt to load a protocol module if the find failed. 
-         * 
-         * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user 
+        /* Attempt to load a protocol module if the find failed.
+         *
+         * 12/09/1996 Marcin: But! this makes REALLY only sense, if the user
          * requested real, full-featured networking support upon configuration.
          * Otherwise module support will break!
          */
-        if (net_families[family]==NULL)
-        {
-                request_module("net-pf-%d",family);
-        }
+        if (net_families[family] == NULL)
+                request_module("net-pf-%d", family);
 #endif
 
-        net_family_read_lock();
-        if (net_families[family] == NULL) {
-                err = -EAFNOSUPPORT;
-                goto out;
-        }
-
-/*
- *      Allocate the socket and allow the family to set things up. if
- *      the protocol is 0, the family is instructed to select an appropriate
- *      default.
- */
-
-        if (!(sock = sock_alloc())) {
-                if (net_ratelimit())
-                        printk(KERN_WARNING "socket: no more sockets\n");
-                err = -ENFILE;          /* Not exactly a match, but its the
-                                           closest posix thing */
-                goto out;
-        }
-
-        sock->type  = type;
+        rcu_read_lock();
+        pf = rcu_dereference(net_families[family]);
+        err = -EAFNOSUPPORT;
+        if (!pf)
+                goto out_release;
 
         /*
          * We will call the ->create function, that possibly is in a loadable
          * module, so we have to bump that loadable module refcnt first.
          */
-        err = -EAFNOSUPPORT;
-        if (!try_module_get(net_families[family]->owner))
+        if (!try_module_get(pf->owner))
                 goto out_release;
 
-        if ((err = net_families[family]->create(sock, protocol)) < 0) {
-                sock->ops = NULL;
+        /* Now protected by module ref count */
+        rcu_read_unlock();
+
+        err = pf->create(sock, protocol);
+        if (err < 0)
                 goto out_module_put;
-        }
 
         /*
          * Now to bump the refcnt of the [loadable] module that owns this
          * socket at sock_release time we decrement its refcnt.
          */
-        if (!try_module_get(sock->ops->owner)) {
-                sock->ops = NULL;
-                goto out_module_put;
-        }
+        if (!try_module_get(sock->ops->owner))
+                goto out_module_busy;
+
         /*
          * Now that we're done with the ->create function, the [loadable]
          * module can have its refcnt decremented
          */
-        module_put(net_families[family]->owner);
+        module_put(pf->owner);
+        err = security_socket_post_create(sock, family, type, protocol, kern);
+        if (err)
+                goto out_release;
         *res = sock;
-        security_socket_post_create(sock, family, type, protocol, kern);
 
-out:
-        net_family_read_unlock();
-        return err;
+        return 0;
+
+out_module_busy:
+        err = -EAFNOSUPPORT;
 out_module_put:
-        module_put(net_families[family]->owner);
-out_release:
+        sock->ops = NULL;
+        module_put(pf->owner);
+out_sock_release:
         sock_release(sock);
-        goto out;
+        return err;
+
+out_release:
+        rcu_read_unlock();
+        goto out_sock_release;
 }
 
 int sock_create(int family, int type, int protocol, struct socket **res)
@@ -1262,7 +1238,8 @@ out_release:
  *      Create a pair of connected sockets.
  */
 
-asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *usockvec)
+asmlinkage long sys_socketpair(int family, int type, int protocol,
+                               int __user *usockvec)
 {
         struct socket *sock1, *sock2;
         int fd1, fd2, err;
@@ -1281,7 +1258,7 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *u
                 goto out_release_1;
 
         err = sock1->ops->socketpair(sock1, sock2);
-        if (err < 0) 
+        if (err < 0)
                 goto out_release_both;
 
         fd1 = fd2 = -1;
@@ -1300,7 +1277,7 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *u
          * Not kernel problem.
          */
 
-        err = put_user(fd1, &usockvec[0]); 
+        err = put_user(fd1, &usockvec[0]);
         if (!err)
                 err = put_user(fd2, &usockvec[1]);
         if (!err)
@@ -1311,19 +1288,18 @@ asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *u
         return err;
 
 out_close_1:
-        sock_release(sock2);
+        sock_release(sock2);
         sys_close(fd1);
         return err;
 
 out_release_both:
-        sock_release(sock2);
+        sock_release(sock2);
 out_release_1:
-        sock_release(sock1);
+        sock_release(sock1);
 out:
         return err;
 }
 
-
 /*
  *      Bind a name to a socket. Nothing much to do here since it's
  *      the protocol's responsibility to handle the local address.
@@ -1338,35 +1314,39 @@ asmlinkage long sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen)
         char address[MAX_SOCK_ADDR];
         int err, fput_needed;
 
-        if((sock = sockfd_lookup_light(fd, &err, &fput_needed))!=NULL)
-        {
-                if((err=move_addr_to_kernel(umyaddr,addrlen,address))>=0) {
-                        err = security_socket_bind(sock, (struct sockaddr *)address, addrlen);
+        sock = sockfd_lookup_light(fd, &err, &fput_needed);
+        if(sock) {
+                err = move_addr_to_kernel(umyaddr, addrlen, address);
+                if (err >= 0) {
+                        err = security_socket_bind(sock,
+                                                   (struct sockaddr *)address,
+                                                   addrlen);
                         if (!err)
                                 err = sock->ops->bind(sock,
-                                        (struct sockaddr *)address, addrlen);
+                                                      (struct sockaddr *)
+                                                      address, addrlen);
                 }
                 fput_light(sock->file, fput_needed);
-        }                       
+        }
         return err;
 }
 
-
 /*
  *      Perform a listen. Basically, we allow the protocol to do anything
  *      necessary for a listen, and if that works, we mark the socket as
  *      ready for listening.
  */
 
-int sysctl_somaxconn = SOMAXCONN;
+int sysctl_somaxconn __read_mostly = SOMAXCONN;
 
 asmlinkage long sys_listen(int fd, int backlog)
 {
         struct socket *sock;
         int err, fput_needed;
-        
-        if ((sock = sockfd_lookup_light(fd, &err, &fput_needed)) != NULL) {
-                if ((unsigned) backlog > sysctl_somaxconn)
+
+        sock = sockfd_lookup_light(fd, &err, &fput_needed);
+        if (sock) {
+                if ((unsigned)backlog > sysctl_somaxconn)
                         backlog = sysctl_somaxconn;
 
                 err = security_socket_listen(sock, backlog);
@@ -1378,7 +1358,6 @@ asmlinkage long sys_listen(int fd, int backlog)
         return err;
 }
 
-
 /*
  *      For accept, we attempt to create a new socket, set up the link
  *      with the client, wake up the client, then return the new
@@ -1391,7 +1370,8 @@ asmlinkage long sys_listen(int fd, int backlog)
  *      clean when we restucture accept also.
  */
 
-asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int __user *upeer_addrlen)
+asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr,
+                           int __user *upeer_addrlen)
 {
         struct socket *sock, *newsock;
         struct file *newfile;
@@ -1403,7 +1383,7 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
                 goto out;
 
         err = -ENFILE;
-        if (!(newsock = sock_alloc())) 
+        if (!(newsock = sock_alloc()))
                 goto out_put;
 
         newsock->type = sock->type;
@@ -1435,11 +1415,13 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
                 goto out_fd;
 
         if (upeer_sockaddr) {
-                if(newsock->ops->getname(newsock, (struct sockaddr *)address, &len, 2)<0) {
+                if (newsock->ops->getname(newsock, (struct sockaddr *)address,
+                                          &len, 2) < 0) {
                         err = -ECONNABORTED;
                         goto out_fd;
                 }
-                err = move_addr_to_user(address, len, upeer_sockaddr, upeer_addrlen);
+                err = move_addr_to_user(address, len, upeer_sockaddr,
+                                        upeer_addrlen);
                 if (err < 0)
                         goto out_fd;
         }
@@ -1461,7 +1443,6 @@ out_fd:
         goto out_put;
 }
 
-
 /*
  *      Attempt to connect to a socket with the server address.  The address
  *      is in user space so we verify it is OK and move it to kernel space.
@@ -1474,7 +1455,8 @@ out_fd:
  *      include the -EINPROGRESS status for such sockets.
  */
 
-asmlinkage long sys_connect(int fd, struct sockaddr __user *uservaddr, int addrlen)
+asmlinkage long sys_connect(int fd, struct sockaddr __user *uservaddr,
+                            int addrlen)
 {
         struct socket *sock;
         char address[MAX_SOCK_ADDR];
@@ -1487,11 +1469,12 @@ asmlinkage long sys_connect(int fd, struct sockaddr __user *uservaddr, int addrl
         if (err < 0)
                 goto out_put;
 
-        err = security_socket_connect(sock, (struct sockaddr *)address, addrlen);
+        err =
+            security_socket_connect(sock, (struct sockaddr *)address, addrlen);
         if (err)
                 goto out_put;
 
-        err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen,
+        err = sock->ops->connect(sock, (struct sockaddr *)address, addrlen,
                                  sock->file->f_flags);
 out_put:
         fput_light(sock->file, fput_needed);
@@ -1504,12 +1487,13 @@ out:
  *      name to user space.
  */
 
-asmlinkage long sys_getsockname(int fd, struct sockaddr __user *usockaddr, int __user *usockaddr_len)
+asmlinkage long sys_getsockname(int fd, struct sockaddr __user *usockaddr,
+                                int __user *usockaddr_len)
 {
         struct socket *sock;
         char address[MAX_SOCK_ADDR];
         int len, err, fput_needed;
-        
+
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (!sock)
                 goto out;
@@ -1534,22 +1518,27 @@ out:
  *      name to user space.
  */
 
-asmlinkage long sys_getpeername(int fd, struct sockaddr __user *usockaddr, int __user *usockaddr_len)
+asmlinkage long sys_getpeername(int fd, struct sockaddr __user *usockaddr,
+                                int __user *usockaddr_len)
 {
         struct socket *sock;
         char address[MAX_SOCK_ADDR];
         int len, err, fput_needed;
 
-        if ((sock = sockfd_lookup_light(fd, &err, &fput_needed)) != NULL) {
+        sock = sockfd_lookup_light(fd, &err, &fput_needed);
+        if (sock != NULL) {
                 err = security_socket_getpeername(sock);
                 if (err) {
                         fput_light(sock->file, fput_needed);
                         return err;
                 }
 
-                err = sock->ops->getname(sock, (struct sockaddr *)address, &len, 1);
+                err =
+                    sock->ops->getname(sock, (struct sockaddr *)address, &len,
+                                       1);
                 if (!err)
-                        err=move_addr_to_user(address,len, usockaddr, usockaddr_len);
+                        err = move_addr_to_user(address, len, usockaddr,
+                                                usockaddr_len);
                 fput_light(sock->file, fput_needed);
         }
         return err;
@@ -1561,8 +1550,9 @@ asmlinkage long sys_getpeername(int fd, struct sockaddr __user *usockaddr, int _
  *      the protocol.
  */
 
-asmlinkage long sys_sendto(int fd, void __user * buff, size_t len, unsigned flags,
-                           struct sockaddr __user *addr, int addr_len)
+asmlinkage long sys_sendto(int fd, void __user *buff, size_t len,
+                           unsigned flags, struct sockaddr __user *addr,
+                           int addr_len)
 {
         struct socket *sock;
         char address[MAX_SOCK_ADDR];
@@ -1579,54 +1569,55 @@ asmlinkage long sys_sendto(int fd, void __user * buff, size_t len, unsigned flag
         sock = sock_from_file(sock_file, &err);
         if (!sock)
                 goto out_put;
-        iov.iov_base=buff;
-        iov.iov_len=len;
-        msg.msg_name=NULL;
-        msg.msg_iov=&iov;
-        msg.msg_iovlen=1;
-        msg.msg_control=NULL;
-        msg.msg_controllen=0;
-        msg.msg_namelen=0;
+        iov.iov_base = buff;
+        iov.iov_len = len;
+        msg.msg_name = NULL;
+        msg.msg_iov = &iov;
+        msg.msg_iovlen = 1;
+        msg.msg_control = NULL;
+        msg.msg_controllen = 0;
+        msg.msg_namelen = 0;
         if (addr) {
                 err = move_addr_to_kernel(addr, addr_len, address);
                 if (err < 0)
                         goto out_put;
-                msg.msg_name=address;
-                msg.msg_namelen=addr_len;
+                msg.msg_name = address;
+                msg.msg_namelen = addr_len;
         }
         if (sock->file->f_flags & O_NONBLOCK)
                 flags |= MSG_DONTWAIT;
         msg.msg_flags = flags;
         err = sock_sendmsg(sock, &msg, len);
 
-out_put:                
+out_put:
         fput_light(sock_file, fput_needed);
         return err;
 }
 
 /*
- *      Send a datagram down a socket. 
+ *      Send a datagram down a socket.
  */
 
-asmlinkage long sys_send(int fd, void __user * buff, size_t len, unsigned flags)
+asmlinkage long sys_send(int fd, void __user *buff, size_t len, unsigned flags)
 {
         return sys_sendto(fd, buff, len, flags, NULL, 0);
 }
 
 /*
- *      Receive a frame from the socket and optionally record the address of the 
+ *      Receive a frame from the socket and optionally record the address of the
  *      sender. We verify the buffers are writable and if needed move the
  *      sender address from kernel to user space.
  */
 
-asmlinkage long sys_recvfrom(int fd, void __user * ubuf, size_t size, unsigned flags,
-                             struct sockaddr __user *addr, int __user *addr_len)
+asmlinkage long sys_recvfrom(int fd, void __user *ubuf, size_t size,
+                             unsigned flags, struct sockaddr __user *addr,
+                             int __user *addr_len)
 {
         struct socket *sock;
         struct iovec iov;
         struct msghdr msg;
         char address[MAX_SOCK_ADDR];
-        int err,err2;
+        int err, err2;
         struct file *sock_file;
         int fput_needed;
 
@@ -1638,23 +1629,22 @@ asmlinkage long sys_recvfrom(int fd, void __user * ubuf, size_t size, unsigned f
         if (!sock)
                 goto out;
 
-        msg.msg_control=NULL;
-        msg.msg_controllen=0;
-        msg.msg_iovlen=1;
-        msg.msg_iov=&iov;
-        iov.iov_len=size;
-        iov.iov_base=ubuf;
-        msg.msg_name=address;
-        msg.msg_namelen=MAX_SOCK_ADDR;
+        msg.msg_control = NULL;
+        msg.msg_controllen = 0;
+        msg.msg_iovlen = 1;
+        msg.msg_iov = &iov;
+        iov.iov_len = size;
+        iov.iov_base = ubuf;
+        msg.msg_name = address;
+        msg.msg_namelen = MAX_SOCK_ADDR;
         if (sock->file->f_flags & O_NONBLOCK)
                 flags |= MSG_DONTWAIT;
-        err=sock_recvmsg(sock, &msg, size, flags);
+        err = sock_recvmsg(sock, &msg, size, flags);
 
-        if(err >= 0 && addr != NULL)
-        {
-                err2=move_addr_to_user(address, msg.msg_namelen, addr, addr_len);
-                if(err2<0)
-                        err=err2;
+        if (err >= 0 && addr != NULL) {
+                err2 = move_addr_to_user(address, msg.msg_namelen, addr, addr_len);
+                if (err2 < 0)
+                        err = err2;
         }
 out:
         fput_light(sock_file, fput_needed);
@@ -1662,10 +1652,11 @@ out:
 }
 
 /*
- *      Receive a datagram from a socket. 
+ *      Receive a datagram from a socket.
  */
 
-asmlinkage long sys_recv(int fd, void __user * ubuf, size_t size, unsigned flags)
+asmlinkage long sys_recv(int fd, void __user *ubuf, size_t size,
+                         unsigned flags)
 {
         return sys_recvfrom(fd, ubuf, size, flags, NULL, NULL);
 }
@@ -1675,24 +1666,29 @@ asmlinkage long sys_recv(int fd, void __user * ubuf, size_t size, unsigned flags
  *      to pass the user mode parameter for the protocols to sort out.
  */
 
-asmlinkage long sys_setsockopt(int fd, int level, int optname, char __user *optval, int optlen)
+asmlinkage long sys_setsockopt(int fd, int level, int optname,
+                               char __user *optval, int optlen)
 {
         int err, fput_needed;
         struct socket *sock;
 
         if (optlen < 0)
                 return -EINVAL;
-                        
-        if ((sock = sockfd_lookup_light(fd, &err, &fput_needed)) != NULL)
-        {
-                err = security_socket_setsockopt(sock,level,optname);
+
+        sock = sockfd_lookup_light(fd, &err, &fput_needed);
+        if (sock != NULL) {
+                err = security_socket_setsockopt(sock, level, optname);
                 if (err)
                         goto out_put;
 
                 if (level == SOL_SOCKET)
-                        err=sock_setsockopt(sock,level,optname,optval,optlen);
+                        err =
+                            sock_setsockopt(sock, level, optname, optval,
+                                            optlen);
                 else
-                        err=sock->ops->setsockopt(sock, level, optname, optval, optlen);
+                        err =
+                            sock->ops->setsockopt(sock, level, optname, optval,
+                                                  optlen);
 out_put:
                 fput_light(sock->file, fput_needed);
         }
@@ -1704,27 +1700,32 @@ out_put:
  *      to pass a user mode parameter for the protocols to sort out.
  */
 
-asmlinkage long sys_getsockopt(int fd, int level, int optname, char __user *optval, int __user *optlen)
+asmlinkage long sys_getsockopt(int fd, int level, int optname,
+                               char __user *optval, int __user *optlen)
 {
         int err, fput_needed;
         struct socket *sock;
 
-        if ((sock = sockfd_lookup_light(fd, &err, &fput_needed)) != NULL) {
+        sock = sockfd_lookup_light(fd, &err, &fput_needed);
+        if (sock != NULL) {
                 err = security_socket_getsockopt(sock, level, optname);
                 if (err)
                         goto out_put;
 
                 if (level == SOL_SOCKET)
-                        err=sock_getsockopt(sock,level,optname,optval,optlen);
+                        err =
+                            sock_getsockopt(sock, level, optname, optval,
+                                            optlen);
                 else
-                        err=sock->ops->getsockopt(sock, level, optname, optval, optlen);
+                        err =
+                            sock->ops->getsockopt(sock, level, optname, optval,
+                                                  optlen);
 out_put:
                 fput_light(sock->file, fput_needed);
         }
         return err;
 }
 
-
 /*
  *      Shutdown a socket.
  */
@@ -1734,8 +1735,8 @@ asmlinkage long sys_shutdown(int fd, int how)
         int err, fput_needed;
         struct socket *sock;
 
-        if ((sock = sockfd_lookup_light(fd, &err, &fput_needed))!=NULL)
-        {
+        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);
@@ -1744,41 +1745,42 @@ asmlinkage long sys_shutdown(int fd, int how)
         return err;
 }
 
-/* A couple of helpful macros for getting the address of the 32/64 bit 
+/* A couple of helpful macros for getting the address of the 32/64 bit
  * fields which are the same type (int / unsigned) on our platforms.
  */
 #define COMPAT_MSG(msg, member) ((MSG_CMSG_COMPAT & flags) ? &msg##_compat->member : &msg->member)
 #define COMPAT_NAMELEN(msg)     COMPAT_MSG(msg, msg_namelen)
 #define COMPAT_FLAGS(msg)       COMPAT_MSG(msg, msg_flags)
 
-
 /*
  *      BSD sendmsg interface
  */
 
 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
 {
-        struct compat_msghdr __user *msg_compat = (struct compat_msghdr __user *)msg;
+        struct compat_msghdr __user *msg_compat =
+            (struct compat_msghdr __user *)msg;
         struct socket *sock;
         char address[MAX_SOCK_ADDR];
         struct iovec iovstack[UIO_FASTIOV], *iov = iovstack;
         unsigned char ctl[sizeof(struct cmsghdr) + 20]
-                        __attribute__ ((aligned (sizeof(__kernel_size_t))));
-                        /* 20 is size of ipv6_pktinfo */
+            __attribute__ ((aligned(sizeof(__kernel_size_t))));
+        /* 20 is size of ipv6_pktinfo */
         unsigned char *ctl_buf = ctl;
         struct msghdr msg_sys;
         int err, ctl_len, iov_size, total_len;
         int fput_needed;
-        
+
         err = -EFAULT;
         if (MSG_CMSG_COMPAT & flags) {
                 if (get_compat_msghdr(&msg_sys, msg_compat))
                         return -EFAULT;
-        } else if (copy_from_user(&msg_sys, msg, sizeof(struct msghdr)))
+        }
+        else if (copy_from_user(&msg_sys, msg, sizeof(struct msghdr)))
                 return -EFAULT;
 
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
-        if (!sock) 
+        if (!sock)
                 goto out;
 
         /* do not move before msg_sys is valid */
@@ -1786,7 +1788,7 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
         if (msg_sys.msg_iovlen > UIO_MAXIOV)
                 goto out_put;
 
-        /* Check whether to allocate the iovec area*/
+        /* Check whether to allocate the iovec area */
         err = -ENOMEM;
         iov_size = msg_sys.msg_iovlen * sizeof(struct iovec);
         if (msg_sys.msg_iovlen > UIO_FASTIOV) {
@@ -1800,7 +1802,7 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
                 err = verify_compat_iovec(&msg_sys, iov, address, VERIFY_READ);
         } else
                 err = verify_iovec(&msg_sys, iov, address, VERIFY_READ);
-        if (err < 0) 
+        if (err < 0)
                 goto out_freeiov;
         total_len = err;
 
@@ -1808,18 +1810,19 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
 
         if (msg_sys.msg_controllen > INT_MAX)
                 goto out_freeiov;
-        ctl_len = msg_sys.msg_controllen; 
+        ctl_len = msg_sys.msg_controllen;
         if ((MSG_CMSG_COMPAT & flags) && ctl_len) {
-                err = cmsghdr_from_user_compat_to_kern(&msg_sys, sock->sk, ctl, sizeof(ctl));
+                err =
+                    cmsghdr_from_user_compat_to_kern(&msg_sys, sock->sk, ctl,
+                                                     sizeof(ctl));
                 if (err)
                         goto out_freeiov;
                 ctl_buf = msg_sys.msg_control;
                 ctl_len = msg_sys.msg_controllen;
         } else if (ctl_len) {
-                if (ctl_len > sizeof(ctl))
-                {
+                if (ctl_len > sizeof(ctl)) {
                         ctl_buf = sock_kmalloc(sock->sk, ctl_len, GFP_KERNEL);
-                        if (ctl_buf == NULL) 
+                        if (ctl_buf == NULL)
                                 goto out_freeiov;
                 }
                 err = -EFAULT;
@@ -1828,7 +1831,8 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
                  * Afterwards, it will be a kernel pointer. Thus the compiler-assisted
                  * checking falls down on this.
                  */
-                if (copy_from_user(ctl_buf, (void __user *) msg_sys.msg_control, ctl_len))
+                if (copy_from_user(ctl_buf, (void __user *)msg_sys.msg_control,
+                                   ctl_len))
                         goto out_freectl;
                 msg_sys.msg_control = ctl_buf;
         }
@@ -1839,14 +1843,14 @@ asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags)
         err = sock_sendmsg(sock, &msg_sys, total_len);
 
 out_freectl:
-        if (ctl_buf != ctl)    
+        if (ctl_buf != ctl)
                 sock_kfree_s(sock->sk, ctl_buf, ctl_len);
 out_freeiov:
         if (iov != iovstack)
                 sock_kfree_s(sock->sk, iov, iov_size);
 out_put:
         fput_light(sock->file, fput_needed);
-out:       
+out:
         return err;
 }
 
@@ -1854,12 +1858,14 @@ out:
  *      BSD recvmsg interface
  */
 
-asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flags)
+asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg,
+                            unsigned int flags)
 {
-        struct compat_msghdr __user *msg_compat = (struct compat_msghdr __user *)msg;
+        struct compat_msghdr __user *msg_compat =
+            (struct compat_msghdr __user *)msg;
         struct socket *sock;
         struct iovec iovstack[UIO_FASTIOV];
-        struct iovec *iov=iovstack;
+        struct iovec *iov = iovstack;
         struct msghdr msg_sys;
         unsigned long cmsg_ptr;
         int err, iov_size, total_len, len;
@@ -1871,13 +1877,13 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
         /* user mode address pointers */
         struct sockaddr __user *uaddr;
         int __user *uaddr_len;
-        
+
         if (MSG_CMSG_COMPAT & flags) {
                 if (get_compat_msghdr(&msg_sys, msg_compat))
                         return -EFAULT;
-        } else
-                if (copy_from_user(&msg_sys,msg,sizeof(struct msghdr)))
-                        return -EFAULT;
+        }
+        else if (copy_from_user(&msg_sys, msg, sizeof(struct msghdr)))
+                return -EFAULT;
 
         sock = sockfd_lookup_light(fd, &err, &fput_needed);
         if (!sock)
@@ -1886,8 +1892,8 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
         err = -EMSGSIZE;
         if (msg_sys.msg_iovlen > UIO_MAXIOV)
                 goto out_put;
-        
-        /* Check whether to allocate the iovec area*/
+
+        /* Check whether to allocate the iovec area */
         err = -ENOMEM;
         iov_size = msg_sys.msg_iovlen * sizeof(struct iovec);
         if (msg_sys.msg_iovlen > UIO_FASTIOV) {
@@ -1897,11 +1903,11 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
         }
 
         /*
-         *      Save the user-mode address (verify_iovec will change the
-         *      kernel msghdr to use the kernel address space)
+         *      Save the user-mode address (verify_iovec will change the
+         *      kernel msghdr to use the kernel address space)
          */
-         
-        uaddr = (void __user *) msg_sys.msg_name;
+
+        uaddr = (void __user *)msg_sys.msg_name;
         uaddr_len = COMPAT_NAMELEN(msg);
         if (MSG_CMSG_COMPAT & flags) {
                 err = verify_compat_iovec(&msg_sys, iov, addr, VERIFY_WRITE);
@@ -1909,13 +1915,13 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
                 err = verify_iovec(&msg_sys, iov, addr, VERIFY_WRITE);
         if (err < 0)
                 goto out_freeiov;
-        total_len=err;
+        total_len = err;
 
         cmsg_ptr = (unsigned long)msg_sys.msg_control;
         msg_sys.msg_flags = 0;
         if (MSG_CMSG_COMPAT & flags)
                 msg_sys.msg_flags = MSG_CMSG_COMPAT;
-        
+
         if (sock->file->f_flags & O_NONBLOCK)
                 flags |= MSG_DONTWAIT;
         err = sock_recvmsg(sock, &msg_sys, total_len, flags);
@@ -1924,7 +1930,8 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
         len = err;
 
         if (uaddr != NULL) {
-                err = move_addr_to_user(addr, msg_sys.msg_namelen, uaddr, uaddr_len);
+                err = move_addr_to_user(addr, msg_sys.msg_namelen, uaddr,
+                                        uaddr_len);
                 if (err < 0)
                         goto out_freeiov;
         }
@@ -1933,10 +1940,10 @@ asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flag
         if (err)
                 goto out_freeiov;
         if (MSG_CMSG_COMPAT & flags)
-                err = __put_user((unsigned long)msg_sys.msg_control-cmsg_ptr, 
+                err = __put_user((unsigned long)msg_sys.msg_control - cmsg_ptr,
                                  &msg_compat->msg_controllen);
         else
-                err = __put_user((unsigned long)msg_sys.msg_control-cmsg_ptr, 
+                err = __put_user((unsigned long)msg_sys.msg_control - cmsg_ptr,
                                  &msg->msg_controllen);
         if (err)
                 goto out_freeiov;
@@ -1955,163 +1962,187 @@ out:
 
 /* Argument list sizes for sys_socketcall */
 #define AL(x) ((x) * sizeof(unsigned long))
-static unsigned char nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
-                                AL(3),AL(3),AL(4),AL(4),AL(4),AL(6),
-                                AL(6),AL(2),AL(5),AL(5),AL(3),AL(3)};
+static const unsigned char nargs[18]={
+        AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
+        AL(3),AL(3),AL(4),AL(4),AL(4),AL(6),
+        AL(6),AL(2),AL(5),AL(5),AL(3),AL(3)
+};
+
 #undef AL
 
 /*
- *      System call vectors. 
+ *      System call vectors.
  *
  *      Argument checking cleaned up. Saved 20% in size.
  *  This function doesn't need to set the kernel lock because
- *  it is set by the callees. 
+ *  it is set by the callees.
  */
 
 asmlinkage long sys_socketcall(int call, unsigned long __user *args)
 {
         unsigned long a[6];
-        unsigned long a0,a1;
+        unsigned long a0, a1;
         int err;
 
-        if(call<1||call>SYS_RECVMSG)
+        if (call < 1 || call > SYS_RECVMSG)
                 return -EINVAL;
 
         /* copy_from_user should be SMP safe. */
         if (copy_from_user(a, args, nargs[call]))
                 return -EFAULT;
 
-        err = audit_socketcall(nargs[call]/sizeof(unsigned long), a);
+        err = audit_socketcall(nargs[call] / sizeof(unsigned long), a);
         if (err)
                 return err;
 
-        a0=a[0];
-        a1=a[1];
-        
-        switch(call) 
-        {
-                case SYS_SOCKET:
-                        err = sys_socket(a0,a1,a[2]);
-                        break;
-                case SYS_BIND:
-                        err = sys_bind(a0,(struct sockaddr __user *)a1, a[2]);
-                        break;
-                case SYS_CONNECT:
-                        err = sys_connect(a0, (struct sockaddr __user *)a1, a[2]);
-                        break;
-                case SYS_LISTEN:
-                        err = sys_listen(a0,a1);
-                        break;
-                case SYS_ACCEPT:
-                        err = sys_accept(a0,(struct sockaddr __user *)a1, (int __user *)a[2]);
-                        break;
-                case SYS_GETSOCKNAME:
-                        err = sys_getsockname(a0,(struct sockaddr __user *)a1, (int __user *)a[2]);
-                        break;
-                case SYS_GETPEERNAME:
-                        err = sys_getpeername(a0, (struct sockaddr __user *)a1, (int __user *)a[2]);
-                        break;
-                case SYS_SOCKETPAIR:
-                        err = sys_socketpair(a0,a1, a[2], (int __user *)a[3]);
-                        break;
-                case SYS_SEND:
-                        err = sys_send(a0, (void __user *)a1, a[2], a[3]);
-                        break;
-                case SYS_SENDTO:
-                        err = sys_sendto(a0,(void __user *)a1, a[2], a[3],
-                                         (struct sockaddr __user *)a[4], a[5]);
-                        break;
-                case SYS_RECV:
-                        err = sys_recv(a0, (void __user *)a1, a[2], a[3]);
-                        break;
-                case SYS_RECVFROM:
-                        err = sys_recvfrom(a0, (void __user *)a1, a[2], a[3],
-                                           (struct sockaddr __user *)a[4], (int __user *)a[5]);
-                        break;
-                case SYS_SHUTDOWN:
-                        err = sys_shutdown(a0,a1);
-                        break;
-                case SYS_SETSOCKOPT:
-                        err = sys_setsockopt(a0, a1, a[2], (char __user *)a[3], a[4]);
-                        break;
-                case SYS_GETSOCKOPT:
-                        err = sys_getsockopt(a0, a1, a[2], (char __user *)a[3], (int __user *)a[4]);
-                        break;
-                case SYS_SENDMSG:
-                        err = sys_sendmsg(a0, (struct msghdr __user *) a1, a[2]);
-                        break;
-                case SYS_RECVMSG:
-                        err = sys_recvmsg(a0, (struct msghdr __user *) a1, a[2]);
-                        break;
-                default:
-                        err = -EINVAL;
-                        break;
+        a0 = a[0];
+        a1 = a[1];
+
+        switch (call) {
+        case SYS_SOCKET:
+                err = sys_socket(a0, a1, a[2]);
+                break;
+        case SYS_BIND:
+                err = sys_bind(a0, (struct sockaddr __user *)a1, a[2]);
+                break;
+        case SYS_CONNECT:
+                err = sys_connect(a0, (struct sockaddr __user *)a1, a[2]);
+                break;
+        case SYS_LISTEN:
+                err = sys_listen(a0, a1);
+                break;
+        case SYS_ACCEPT:
+                err =
+                    sys_accept(a0, (struct sockaddr __user *)a1,
+                               (int __user *)a[2]);
+                break;
+        case SYS_GETSOCKNAME:
+                err =
+                    sys_getsockname(a0, (struct sockaddr __user *)a1,
+                                    (int __user *)a[2]);
+                break;
+        case SYS_GETPEERNAME:
+                err =
+                    sys_getpeername(a0, (struct sockaddr __user *)a1,
+                                    (int __user *)a[2]);
+                break;
+        case SYS_SOCKETPAIR:
+                err = sys_socketpair(a0, a1, a[2], (int __user *)a[3]);
+                break;
+        case SYS_SEND:
+                err = sys_send(a0, (void __user *)a1, a[2], a[3]);
+                break;
+        case SYS_SENDTO:
+                err = sys_sendto(a0, (void __user *)a1, a[2], a[3],
+                                 (struct sockaddr __user *)a[4], a[5]);
+                break;
+        case SYS_RECV:
+                err = sys_recv(a0, (void __user *)a1, a[2], a[3]);
+                break;
+        case SYS_RECVFROM:
+                err = sys_recvfrom(a0, (void __user *)a1, a[2], a[3],
+                                   (struct sockaddr __user *)a[4],
+                                   (int __user *)a[5]);
+                break;
+        case SYS_SHUTDOWN:
+                err = sys_shutdown(a0, a1);
+                break;
+        case SYS_SETSOCKOPT:
+                err = sys_setsockopt(a0, a1, a[2], (char __user *)a[3], a[4]);
+                break;
+        case SYS_GETSOCKOPT:
+                err =
+                    sys_getsockopt(a0, a1, a[2], (char __user *)a[3],
+                                   (int __user *)a[4]);
+                break;
+        case SYS_SENDMSG:
+                err = sys_sendmsg(a0, (struct msghdr __user *)a1, a[2]);
+                break;
+        case SYS_RECVMSG:
+                err = sys_recvmsg(a0, (struct msghdr __user *)a1, a[2]);
+                break;
+        default:
+                err = -EINVAL;
+                break;
         }
         return err;
 }
 
-#endif /* __ARCH_WANT_SYS_SOCKETCALL */
+#endif                          /* __ARCH_WANT_SYS_SOCKETCALL */
 
-/*
+/**
+ *      sock_register - add a socket protocol handler
+ *      @ops: description of protocol
+ *
  *      This function is called by a protocol handler that wants to
  *      advertise its address family, and have it linked into the
- *      SOCKET module.
+ *      socket interface. The value ops->family coresponds to the
+ *      socket system call protocol family.
  */
-
-int sock_register(struct net_proto_family *ops)
+int sock_register(const struct net_proto_family *ops)
 {
         int err;
 
         if (ops->family >= NPROTO) {
-                printk(KERN_CRIT "protocol %d >= NPROTO(%d)\n", ops->family, NPROTO);
+                printk(KERN_CRIT "protocol %d >= NPROTO(%d)\n", ops->family,
+                       NPROTO);
                 return -ENOBUFS;
         }
-        net_family_write_lock();
-        err = -EEXIST;
-        if (net_families[ops->family] == NULL) {
-                net_families[ops->family]=ops;
+
+        spin_lock(&net_family_lock);
+        if (net_families[ops->family])
+                err = -EEXIST;
+        else {
+                net_families[ops->family] = ops;
                 err = 0;
         }
-        net_family_write_unlock();
-        printk(KERN_INFO "NET: Registered protocol family %d\n",
-               ops->family);
+        spin_unlock(&net_family_lock);
+
+        printk(KERN_INFO "NET: Registered protocol family %d\n", ops->family);
         return err;
 }
 
-/*
+/**
+ *      sock_unregister - remove a protocol handler
+ *      @family: protocol family to remove
+ *
  *      This function is called by a protocol handler that wants to
  *      remove its address family, and have it unlinked from the
- *      SOCKET module.
+ *      new socket creation.
+ *
+ *      If protocol handler is a module, then it can use module reference
+ *      counts to protect against new references. If protocol handler is not
+ *      a module then it needs to provide its own protection in
+ *      the ops->create routine.
  */
-
-int sock_unregister(int family)
+void sock_unregister(int family)
 {
-        if (family < 0 || family >= NPROTO)
-                return -1;
+        BUG_ON(family < 0 || family >= NPROTO);
 
-        net_family_write_lock();
-        net_families[family]=NULL;
-        net_family_write_unlock();
-        printk(KERN_INFO "NET: Unregistered protocol family %d\n",
-               family);
-        return 0;
+        spin_lock(&net_family_lock);
+        net_families[family] = NULL;
+        spin_unlock(&net_family_lock);
+
+        synchronize_rcu();
+
+        printk(KERN_INFO "NET: Unregistered protocol family %d\n", family);
 }
 
 static int __init sock_init(void)
 {
         /*
-         *      Initialize sock SLAB cache.
+         *      Initialize sock SLAB cache.
          */
-         
+
         sk_init();
 
         /*
-         *      Initialize skbuff SLAB cache 
+         *      Initialize skbuff SLAB cache
          */
         skb_init();
 
         /*
-         *      Initialize the protocols module. 
+         *      Initialize the protocols module.
          */
 
         init_inodecache();
@@ -2137,7 +2168,7 @@ void socket_seq_show(struct seq_file *seq)
         int counter = 0;
 
         for_each_possible_cpu(cpu)
-                counter += per_cpu(sockets_in_use, cpu);
+            counter += per_cpu(sockets_in_use, cpu);
 
         /* It can be negative, by the way. 8) */
         if (counter < 0)
@@ -2145,11 +2176,11 @@ void socket_seq_show(struct seq_file *seq)
 
         seq_printf(seq, "sockets: used %d\n", counter);
 }
-#endif /* CONFIG_PROC_FS */
+#endif                          /* CONFIG_PROC_FS */
 
 #ifdef CONFIG_COMPAT
 static long compat_sock_ioctl(struct file *file, unsigned cmd,
-                                unsigned long arg)
+                              unsigned long arg)
 {
         struct socket *sock = file->private_data;
         int ret = -ENOIOCTLCMD;
@@ -2161,6 +2192,109 @@ static long compat_sock_ioctl(struct file *file, unsigned cmd,
 }
 #endif
 
+int kernel_bind(struct socket *sock, struct sockaddr *addr, int addrlen)
+{
+        return sock->ops->bind(sock, addr, addrlen);
+}
+
+int kernel_listen(struct socket *sock, int backlog)
+{
+        return sock->ops->listen(sock, backlog);
+}
+
+int kernel_accept(struct socket *sock, struct socket **newsock, int flags)
+{
+        struct sock *sk = sock->sk;
+        int err;
+
+        err = sock_create_lite(sk->sk_family, sk->sk_type, sk->sk_protocol,
+                               newsock);
+        if (err < 0)
+                goto done;
+
+        err = sock->ops->accept(sock, *newsock, flags);
+        if (err < 0) {
+                sock_release(*newsock);
+                goto done;
+        }
+
+        (*newsock)->ops = sock->ops;
+
+done:
+        return err;
+}
+
+int kernel_connect(struct socket *sock, struct sockaddr *addr, int addrlen,
+                   int flags)
+{
+        return sock->ops->connect(sock, addr, addrlen, flags);
+}
+
+int kernel_getsockname(struct socket *sock, struct sockaddr *addr,
+                         int *addrlen)
+{
+        return sock->ops->getname(sock, addr, addrlen, 0);
+}
+
+int kernel_getpeername(struct socket *sock, struct sockaddr *addr,
+                         int *addrlen)
+{
+        return sock->ops->getname(sock, addr, addrlen, 1);
+}
+
+int kernel_getsockopt(struct socket *sock, int level, int optname,
+                        char *optval, int *optlen)
+{
+        mm_segment_t oldfs = get_fs();
+        int err;
+
+        set_fs(KERNEL_DS);
+        if (level == SOL_SOCKET)
+                err = sock_getsockopt(sock, level, optname, optval, optlen);
+        else
+                err = sock->ops->getsockopt(sock, level, optname, optval,
+                                            optlen);
+        set_fs(oldfs);
+        return err;
+}
+
+int kernel_setsockopt(struct socket *sock, int level, int optname,
+                        char *optval, int optlen)
+{
+        mm_segment_t oldfs = get_fs();
+        int err;
+
+        set_fs(KERNEL_DS);
+        if (level == SOL_SOCKET)
+                err = sock_setsockopt(sock, level, optname, optval, optlen);
+        else
+                err = sock->ops->setsockopt(sock, level, optname, optval,
+                                            optlen);
+        set_fs(oldfs);
+        return err;
+}
+
+int kernel_sendpage(struct socket *sock, struct page *page, int offset,
+                    size_t size, int flags)
+{
+        if (sock->ops->sendpage)
+                return sock->ops->sendpage(sock, page, offset, size, flags);
+
+        return sock_no_sendpage(sock, page, offset, size, flags);
+}
+
+int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg)
+{
+        mm_segment_t oldfs = get_fs();
+        int err;
+
+        set_fs(KERNEL_DS);
+        err = sock->ops->ioctl(sock, cmd, arg);
+        set_fs(oldfs);
+
+        return err;
+}
+
 /* ABI emulation layers need these two */
 EXPORT_SYMBOL(move_addr_to_kernel);
 EXPORT_SYMBOL(move_addr_to_user);
@@ -2177,3 +2311,13 @@ EXPORT_SYMBOL(sock_wake_async);
 EXPORT_SYMBOL(sockfd_lookup);
 EXPORT_SYMBOL(kernel_sendmsg);
 EXPORT_SYMBOL(kernel_recvmsg);
+EXPORT_SYMBOL(kernel_bind);
+EXPORT_SYMBOL(kernel_listen);
+EXPORT_SYMBOL(kernel_accept);
+EXPORT_SYMBOL(kernel_connect);
+EXPORT_SYMBOL(kernel_getsockname);
+EXPORT_SYMBOL(kernel_getpeername);
+EXPORT_SYMBOL(kernel_getsockopt);
+EXPORT_SYMBOL(kernel_setsockopt);
+EXPORT_SYMBOL(kernel_sendpage);
+EXPORT_SYMBOL(kernel_sock_ioctl);