4 files changed, 67 insertions, 93 deletions

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 66c7a20011f3..da3d21c41d90 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -40,6 +40,7 @@
 #include <linux/net.h>
 #include <linux/netdevice.h>
 #include <linux/uio.h>
+#include <linux/slab.h>
 #include <linux/skbuff.h>
 #include <linux/smp_lock.h>
 #include <linux/socket.h>
@@ -1298,6 +1299,7 @@ static int ipx_setsockopt(struct socket *sock, int level, int optname,
         int opt;
         int rc = -EINVAL;
 
+        lock_kernel();
         if (optlen != sizeof(int))
                 goto out;
 
@@ -1312,6 +1314,7 @@ static int ipx_setsockopt(struct socket *sock, int level, int optname,
         ipx_sk(sk)->type = opt;
         rc = 0;
 out:
+        unlock_kernel();
         return rc;
 }
 
@@ -1323,6 +1326,7 @@ static int ipx_getsockopt(struct socket *sock, int level, int optname,
         int len;
         int rc = -ENOPROTOOPT;
 
+        lock_kernel();
         if (!(level == SOL_IPX && optname == IPX_TYPE))
                 goto out;
 
@@ -1343,6 +1347,7 @@ static int ipx_getsockopt(struct socket *sock, int level, int optname,
 
         rc = 0;
 out:
+        unlock_kernel();
         return rc;
 }
 
@@ -1352,12 +1357,13 @@ static struct proto ipx_proto = {
         .obj_size = sizeof(struct ipx_sock),
 };
 
-static int ipx_create(struct net *net, struct socket *sock, int protocol)
+static int ipx_create(struct net *net, struct socket *sock, int protocol,
+                      int kern)
 {
         int rc = -ESOCKTNOSUPPORT;
         struct sock *sk;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EAFNOSUPPORT;
 
         /*
@@ -1390,6 +1396,7 @@ static int ipx_release(struct socket *sock)
         if (!sk)
                 goto out;
 
+        lock_kernel();
         if (!sock_flag(sk, SOCK_DEAD))
                 sk->sk_state_change(sk);
 
@@ -1397,6 +1404,7 @@ static int ipx_release(struct socket *sock)
         sock->sk = NULL;
         sk_refcnt_debug_release(sk);
         ipx_destroy_socket(sk);
+        unlock_kernel();
 out:
         return 0;
 }
@@ -1424,7 +1432,8 @@ static __be16 ipx_first_free_socketnum(struct ipx_interface *intrfc)
         return htons(socketNum);
 }
 
-static int ipx_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
+static int __ipx_bind(struct socket *sock,
+                        struct sockaddr *uaddr, int addr_len)
 {
         struct sock *sk = sock->sk;
         struct ipx_sock *ipxs = ipx_sk(sk);
@@ -1519,6 +1528,17 @@ out:
         return rc;
 }
 
+static int ipx_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
+{
+        int rc;
+
+        lock_kernel();
+        rc = __ipx_bind(sock, uaddr, addr_len);
+        unlock_kernel();
+
+        return rc;
+}
+
 static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
         int addr_len, int flags)
 {
@@ -1531,6 +1551,7 @@ static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
         sk->sk_state    = TCP_CLOSE;
         sock->state     = SS_UNCONNECTED;
 
+        lock_kernel();
         if (addr_len != sizeof(*addr))
                 goto out;
         addr = (struct sockaddr_ipx *)uaddr;
@@ -1550,7 +1571,7 @@ static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
                         IPX_NODE_LEN);
 #endif  /* CONFIG_IPX_INTERN */
 
-                rc = ipx_bind(sock, (struct sockaddr *)&uaddr,
+                rc = __ipx_bind(sock, (struct sockaddr *)&uaddr,
                               sizeof(struct sockaddr_ipx));
                 if (rc)
                         goto out;
@@ -1577,6 +1598,7 @@ static int ipx_connect(struct socket *sock, struct sockaddr *uaddr,
                 ipxrtr_put(rt);
         rc = 0;
 out:
+        unlock_kernel();
         return rc;
 }
 
@@ -1592,6 +1614,7 @@ static int ipx_getname(struct socket *sock, struct sockaddr *uaddr,
 
         *uaddr_len = sizeof(struct sockaddr_ipx);
 
+        lock_kernel();
         if (peer) {
                 rc = -ENOTCONN;
                 if (sk->sk_state != TCP_ESTABLISHED)
@@ -1626,6 +1649,19 @@ static int ipx_getname(struct socket *sock, struct sockaddr *uaddr,
 
         rc = 0;
 out:
+        unlock_kernel();
+        return rc;
+}
+
+static unsigned int ipx_datagram_poll(struct file *file, struct socket *sock,
+                           poll_table *wait)
+{
+        int rc;
+
+        lock_kernel();
+        rc = datagram_poll(file, sock, wait);
+        unlock_kernel();
+
         return rc;
 }
 
@@ -1700,6 +1736,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
         int rc = -EINVAL;
         int flags = msg->msg_flags;
 
+        lock_kernel();
         /* Socket gets bound below anyway */
 /*      if (sk->sk_zapped)
                 return -EIO; */ /* Socket not bound */
@@ -1723,7 +1760,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
                         memcpy(uaddr.sipx_node, ipxs->intrfc->if_node,
                                 IPX_NODE_LEN);
 #endif
-                        rc = ipx_bind(sock, (struct sockaddr *)&uaddr,
+                        rc = __ipx_bind(sock, (struct sockaddr *)&uaddr,
                                         sizeof(struct sockaddr_ipx));
                         if (rc)
                                 goto out;
@@ -1751,6 +1788,7 @@ static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock,
         if (rc >= 0)
                 rc = len;
 out:
+        unlock_kernel();
         return rc;
 }
 
@@ -1765,6 +1803,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,
         struct sk_buff *skb;
         int copied, rc;
 
+        lock_kernel();
         /* put the autobinding in */
         if (!ipxs->port) {
                 struct sockaddr_ipx uaddr;
@@ -1779,7 +1818,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,
                 memcpy(uaddr.sipx_node, ipxs->intrfc->if_node, IPX_NODE_LEN);
 #endif  /* CONFIG_IPX_INTERN */
 
-                rc = ipx_bind(sock, (struct sockaddr *)&uaddr,
+                rc = __ipx_bind(sock, (struct sockaddr *)&uaddr,
                               sizeof(struct sockaddr_ipx));
                 if (rc)
                         goto out;
@@ -1823,6 +1862,7 @@ static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock,
 out_free:
         skb_free_datagram(sk, skb);
 out:
+        unlock_kernel();
         return rc;
 }
 
@@ -1834,6 +1874,7 @@ static int ipx_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         struct sock *sk = sock->sk;
         void __user *argp = (void __user *)arg;
 
+        lock_kernel();
         switch (cmd) {
         case TIOCOUTQ:
                 amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
@@ -1896,6 +1937,7 @@ static int ipx_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                 rc = -ENOIOCTLCMD;
                 break;
         }
+        unlock_kernel();
 
         return rc;
 }
@@ -1927,13 +1969,13 @@ static int ipx_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long
  * Socket family declarations
  */
 
-static struct net_proto_family ipx_family_ops = {
+static const struct net_proto_family ipx_family_ops = {
         .family         = PF_IPX,
         .create         = ipx_create,
         .owner          = THIS_MODULE,
 };
 
-static const struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
+static const struct proto_ops ipx_dgram_ops = {
         .family         = PF_IPX,
         .owner          = THIS_MODULE,
         .release        = ipx_release,
@@ -1942,7 +1984,7 @@ static const struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
         .socketpair     = sock_no_socketpair,
         .accept         = sock_no_accept,
         .getname        = ipx_getname,
-        .poll           = datagram_poll,
+        .poll           = ipx_datagram_poll,
         .ioctl          = ipx_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = ipx_compat_ioctl,
@@ -1957,8 +1999,6 @@ static const struct proto_ops SOCKOPS_WRAPPED(ipx_dgram_ops) = {
         .sendpage       = sock_no_sendpage,
 };
 
-SOCKOPS_WRAP(ipx_dgram, PF_IPX);
-
 static struct packet_type ipx_8023_packet_type __read_mostly = {
         .type           = cpu_to_be16(ETH_P_802_3),
         .func           = ipx_rcv,
diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
index 576178482f89..26b5bfcf1d03 100644
--- a/net/ipx/ipx_proc.c
+++ b/net/ipx/ipx_proc.c
@@ -13,45 +13,15 @@
 #include <net/tcp_states.h>
 #include <net/ipx.h>
 
-static __inline__ struct ipx_interface *ipx_get_interface_idx(loff_t pos)
-{
-        struct ipx_interface *i;
-
-        list_for_each_entry(i, &ipx_interfaces, node)
-                if (!pos--)
-                        goto out;
-        i = NULL;
-out:
-        return i;
-}
-
-static struct ipx_interface *ipx_interfaces_next(struct ipx_interface *i)
-{
-        struct ipx_interface *rc = NULL;
-
-        if (i->node.next != &ipx_interfaces)
-                rc = list_entry(i->node.next, struct ipx_interface, node);
-        return rc;
-}
-
 static void *ipx_seq_interface_start(struct seq_file *seq, loff_t *pos)
 {
-        loff_t l = *pos;
-
         spin_lock_bh(&ipx_interfaces_lock);
-        return l ? ipx_get_interface_idx(--l) : SEQ_START_TOKEN;
+        return seq_list_start_head(&ipx_interfaces, *pos);
 }
 
 static void *ipx_seq_interface_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct ipx_interface *i;
-
-        ++*pos;
-        if (v == SEQ_START_TOKEN)
-                i = ipx_interfaces_head();
-        else
-                i = ipx_interfaces_next(v);
-        return i;
+        return seq_list_next(v, &ipx_interfaces, pos);
 }
 
 static void ipx_seq_interface_stop(struct seq_file *seq, void *v)
@@ -63,7 +33,7 @@ static int ipx_seq_interface_show(struct seq_file *seq, void *v)
 {
         struct ipx_interface *i;
 
-        if (v == SEQ_START_TOKEN) {
+        if (v == &ipx_interfaces) {
                 seq_puts(seq, "Network    Node_Address   Primary  Device     "
                               "Frame_Type");
 #ifdef IPX_REFCNT_DEBUG
@@ -73,7 +43,7 @@ static int ipx_seq_interface_show(struct seq_file *seq, void *v)
                 goto out;
         }
 
-        i = v;
+        i = list_entry(v, struct ipx_interface, node);
         seq_printf(seq, "%08lX   ", (unsigned long int)ntohl(i->if_netnum));
         seq_printf(seq, "%02X%02X%02X%02X%02X%02X   ",
                         i->if_node[0], i->if_node[1], i->if_node[2],
@@ -89,53 +59,15 @@ out:
         return 0;
 }
 
-static struct ipx_route *ipx_routes_head(void)
-{
-        struct ipx_route *rc = NULL;
-
-        if (!list_empty(&ipx_routes))
-                rc = list_entry(ipx_routes.next, struct ipx_route, node);
-        return rc;
-}
-
-static struct ipx_route *ipx_routes_next(struct ipx_route *r)
-{
-        struct ipx_route *rc = NULL;
-
-        if (r->node.next != &ipx_routes)
-                rc = list_entry(r->node.next, struct ipx_route, node);
-        return rc;
-}
-
-static __inline__ struct ipx_route *ipx_get_route_idx(loff_t pos)
-{
-        struct ipx_route *r;
-
-        list_for_each_entry(r, &ipx_routes, node)
-                if (!pos--)
-                        goto out;
-        r = NULL;
-out:
-        return r;
-}
-
 static void *ipx_seq_route_start(struct seq_file *seq, loff_t *pos)
 {
-        loff_t l = *pos;
         read_lock_bh(&ipx_routes_lock);
-        return l ? ipx_get_route_idx(--l) : SEQ_START_TOKEN;
+        return seq_list_start_head(&ipx_routes, *pos);
 }
 
 static void *ipx_seq_route_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct ipx_route *r;
-
-        ++*pos;
-        if (v == SEQ_START_TOKEN)
-                r = ipx_routes_head();
-        else
-                r = ipx_routes_next(v);
-        return r;
+        return seq_list_next(v, &ipx_routes, pos);
 }
 
 static void ipx_seq_route_stop(struct seq_file *seq, void *v)
@@ -147,11 +79,13 @@ static int ipx_seq_route_show(struct seq_file *seq, void *v)
 {
         struct ipx_route *rt;
 
-        if (v == SEQ_START_TOKEN) {
+        if (v == &ipx_routes) {
                 seq_puts(seq, "Network    Router_Net   Router_Node\n");
                 goto out;
         }
-        rt = v;
+
+        rt = list_entry(v, struct ipx_route, node);
+
         seq_printf(seq, "%08lX   ", (unsigned long int)ntohl(rt->ir_net));
         if (rt->ir_routed)
                 seq_printf(seq, "%08lX     %02X%02X%02X%02X%02X%02X\n",
@@ -226,9 +160,9 @@ static void *ipx_seq_socket_next(struct seq_file *seq, void *v, loff_t *pos)
         spin_unlock_bh(&i->if_sklist_lock);
         sk = NULL;
         for (;;) {
-                i = ipx_interfaces_next(i);
-                if (!i)
+                if (i->node.next == &ipx_interfaces)
                         break;
+                i = list_entry(i->node.next, struct ipx_interface, node);
                 spin_lock_bh(&i->if_sklist_lock);
                 if (!hlist_empty(&i->if_sklist)) {
                         sk = sk_head(&i->if_sklist);
diff --git a/net/ipx/ipx_route.c b/net/ipx/ipx_route.c
index e16c11423527..30f4519b092f 100644
--- a/net/ipx/ipx_route.c
+++ b/net/ipx/ipx_route.c
@@ -9,6 +9,7 @@
 
 #include <linux/list.h>
 #include <linux/route.h>
+#include <linux/slab.h>
 #include <linux/spinlock.h>
 
 #include <net/ipx.h>
diff --git a/net/ipx/sysctl_net_ipx.c b/net/ipx/sysctl_net_ipx.c
index 633fcab35580..bd6dca00fb85 100644
--- a/net/ipx/sysctl_net_ipx.c
+++ b/net/ipx/sysctl_net_ipx.c
@@ -18,19 +18,18 @@ extern int sysctl_ipx_pprop_broadcasting;
 
 static struct ctl_table ipx_table[] = {
         {
-                .ctl_name       = NET_IPX_PPROP_BROADCASTING,
                 .procname       = "ipx_pprop_broadcasting",
                 .data           = &sysctl_ipx_pprop_broadcasting,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec,
         },
-        { 0 },
+        { },
 };
 
 static struct ctl_path ipx_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "ipx", .ctl_name = NET_IPX, },
+        { .procname = "net", },
+        { .procname = "ipx", },
         { }
 };