Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

25 files changed, 281 insertions, 190 deletions

diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index dd35641835f4..2a4efcea3423 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -48,6 +48,7 @@
 #include <linux/smp_lock.h>
 #include <linux/socket.h>
 #include <linux/sockios.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/net.h>
 #include <linux/irda.h>
@@ -61,7 +62,7 @@
 
 #include <net/irda/af_irda.h>
 
-static int irda_create(struct net *net, struct socket *sock, int protocol);
+static int irda_create(struct net *net, struct socket *sock, int protocol, int kern);
 
 static const struct proto_ops irda_stream_ops;
 static const struct proto_ops irda_seqpacket_ops;
@@ -714,11 +715,14 @@ static int irda_getname(struct socket *sock, struct sockaddr *uaddr,
         struct sockaddr_irda saddr;
         struct sock *sk = sock->sk;
         struct irda_sock *self = irda_sk(sk);
+        int err;
 
+        lock_kernel();
         memset(&saddr, 0, sizeof(saddr));
         if (peer) {
+                err  = -ENOTCONN;
                 if (sk->sk_state != TCP_ESTABLISHED)
-                        return -ENOTCONN;
+                        goto out;
 
                 saddr.sir_family = AF_IRDA;
                 saddr.sir_lsap_sel = self->dtsap_sel;
@@ -735,8 +739,10 @@ static int irda_getname(struct socket *sock, struct sockaddr *uaddr,
         /* uaddr_len come to us uninitialised */
         *uaddr_len = sizeof (struct sockaddr_irda);
         memcpy(uaddr, &saddr, *uaddr_len);
-
-        return 0;
+        err = 0;
+out:
+        unlock_kernel();
+        return err;
 }
 
 /*
@@ -748,21 +754,25 @@ static int irda_getname(struct socket *sock, struct sockaddr *uaddr,
 static int irda_listen(struct socket *sock, int backlog)
 {
         struct sock *sk = sock->sk;
+        int err = -EOPNOTSUPP;
 
         IRDA_DEBUG(2, "%s()\n", __func__);
 
+        lock_kernel();
         if ((sk->sk_type != SOCK_STREAM) && (sk->sk_type != SOCK_SEQPACKET) &&
             (sk->sk_type != SOCK_DGRAM))
-                return -EOPNOTSUPP;
+                goto out;
 
         if (sk->sk_state != TCP_LISTEN) {
                 sk->sk_max_ack_backlog = backlog;
                 sk->sk_state           = TCP_LISTEN;
 
-                return 0;
+                err = 0;
         }
+out:
+        unlock_kernel();
 
-        return -EOPNOTSUPP;
+        return err;
 }
 
 /*
@@ -783,36 +793,40 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         if (addr_len != sizeof(struct sockaddr_irda))
                 return -EINVAL;
 
+        lock_kernel();
 #ifdef CONFIG_IRDA_ULTRA
         /* Special care for Ultra sockets */
         if ((sk->sk_type == SOCK_DGRAM) &&
             (sk->sk_protocol == IRDAPROTO_ULTRA)) {
                 self->pid = addr->sir_lsap_sel;
+                err = -EOPNOTSUPP;
                 if (self->pid & 0x80) {
                         IRDA_DEBUG(0, "%s(), extension in PID not supp!\n", __func__);
-                        return -EOPNOTSUPP;
+                        goto out;
                 }
                 err = irda_open_lsap(self, self->pid);
                 if (err < 0)
-                        return err;
+                        goto out;
 
                 /* Pretend we are connected */
                 sock->state = SS_CONNECTED;
                 sk->sk_state   = TCP_ESTABLISHED;
+                err = 0;
 
-                return 0;
+                goto out;
         }
 #endif /* CONFIG_IRDA_ULTRA */
 
         self->ias_obj = irias_new_object(addr->sir_name, jiffies);
+        err = -ENOMEM;
         if (self->ias_obj == NULL)
-                return -ENOMEM;
+                goto out;
 
         err = irda_open_tsap(self, addr->sir_lsap_sel, addr->sir_name);
         if (err < 0) {
                 kfree(self->ias_obj->name);
                 kfree(self->ias_obj);
-                return err;
+                goto out;
         }
 
         /*  Register with LM-IAS */
@@ -820,7 +834,10 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                                  self->stsap_sel, IAS_KERNEL_ATTR);
         irias_insert_object(self->ias_obj);