linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / unix / af_unix.c

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index bcda09e..7020c57 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -83,6 +83,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
@@ -130,24 +131,6 @@ static atomic_t unix_nr_socks = ATOMIC_INIT(0);
 
 #define UNIX_ABSTRACT(sk)      (unix_sk(sk)->addr->hash != UNIX_HASH_SIZE)
 
-#ifdef CONFIG_SECURITY_NETWORK
-static void unix_get_secdata(struct scm_cookie *scm, struct sk_buff *skb)
-{
-       memcpy(UNIXSID(skb), &scm->secid, sizeof(u32));
-}
-
-static inline void unix_set_secdata(struct scm_cookie *scm, struct sk_buff *skb)
-{
-       scm->secid = *UNIXSID(skb);
-}
-#else
-static inline void unix_get_secdata(struct scm_cookie *scm, struct sk_buff *skb)
-{ }
-
-static inline void unix_set_secdata(struct scm_cookie *scm, struct sk_buff *skb)
-{ }
-#endif /* CONFIG_SECURITY_NETWORK */
-
 /*
  *  SMP locking strategy:
  *    hash table is protected with spinlock unix_table_lock
@@ -564,14 +547,6 @@ static struct proto unix_proto = {
        .obj_size = sizeof(struct unix_sock),
 };
 
-/*
- * AF_UNIX sockets do not interact with hardware, hence they
- * dont trigger interrupts - so it's safe for them to have
- * bh-unsafe locking for their sk_receive_queue.lock. Split off
- * this special lock-class by reinitializing the spinlock key:
- */
-static struct lock_class_key af_unix_sk_receive_queue_lock_key;
-
 static struct sock * unix_create1(struct socket *sock)
 {
        struct sock *sk = NULL;
@@ -587,8 +562,6 @@ static struct sock * unix_create1(struct socket *sock)
        atomic_inc(&unix_nr_socks);
 
        sock_init_data(sock,sk);
-       lockdep_set_class(&sk->sk_receive_queue.lock,
-                               &af_unix_sk_receive_queue_lock_key);
 
        sk->sk_write_space      = unix_write_space;
        sk->sk_max_ack_backlog  = sysctl_unix_max_dgram_qlen;
@@ -598,7 +571,7 @@ static struct sock * unix_create1(struct socket *sock)
        u->mnt    = NULL;
        spin_lock_init(&u->lock);
        atomic_set(&u->inflight, sock ? 0 : -1);
-       mutex_init(&u->readlock); /* single task reading lock */
+       init_MUTEX(&u->readsem); /* single task reading lock */
        init_waitqueue_head(&u->peer_wait);
        unix_insert_socket(unix_sockets_unbound, sk);
 out:
@@ -655,17 +628,18 @@ static int unix_autobind(struct socket *sock)
        struct unix_address * addr;
        int err;
 
-       mutex_lock(&u->readlock);
+       down(&u->readsem);
 
        err = 0;
        if (u->addr)
                goto out;
 
        err = -ENOMEM;
-       addr = kzalloc(sizeof(*addr) + sizeof(short) + 16, GFP_KERNEL);
+       addr = kmalloc(sizeof(*addr) + sizeof(short) + 16, GFP_KERNEL);
        if (!addr)
                goto out;
 
+       memset(addr, 0, sizeof(*addr) + sizeof(short) + 16);
        addr->name->sun_family = AF_UNIX;
        atomic_set(&addr->refcnt, 1);
 
@@ -692,7 +666,7 @@ retry:
        spin_unlock(&unix_table_lock);
        err = 0;
 
-out:   mutex_unlock(&u->readlock);
+out:   up(&u->readsem);
        return err;
 }
 
@@ -775,7 +749,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                goto out;
        addr_len = err;
 
-       mutex_lock(&u->readlock);
+       down(&u->readsem);
 
        err = -EINVAL;
        if (u->addr)
@@ -847,7 +821,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 out_unlock:
        spin_unlock(&unix_table_lock);
 out_up:
-       mutex_unlock(&u->readlock);
+       up(&u->readsem);
 out:
        return err;
 
@@ -1053,7 +1027,7 @@ restart:
                goto out_unlock;
        }
 
-       unix_state_wlock_nested(sk);
+       unix_state_wlock(sk);
 
        if (sk->sk_state != st) {
                unix_state_wunlock(sk);
@@ -1321,7 +1295,6 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
        memcpy(UNIXCREDS(skb), &siocb->scm->creds, sizeof(struct ucred));
        if (siocb->scm->fp)
                unix_attach_fds(siocb->scm, skb);
-       unix_get_secdata(siocb->scm, skb);
 
        skb->h.raw = skb->data;
        err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len);
@@ -1459,15 +1432,15 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
        while(sent < len)
        {
                /*
-                *      Optimisation for the fact that under 0.01% of X
-                *      messages typically need breaking up.
+                *      Optimisation for the fact that under 0.01% of X messages typically
+                *      need breaking up.
                 */
 
-               size = len-sent;
+               size=len-sent;
 
                /* Keep two messages in the pipe so it schedules better */
-               if (size > ((sk->sk_sndbuf >> 1) - 64))
-                       size = (sk->sk_sndbuf >> 1) - 64;
+               if (size > sk->sk_sndbuf / 2 - 64)
+                       size = sk->sk_sndbuf / 2 - 64;
 
                if (size > SKB_MAX_ALLOC)
                        size = SKB_MAX_ALLOC;
@@ -1577,7 +1550,7 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
 
        msg->msg_namelen = 0;
 
-       mutex_lock(&u->readlock);
+       down(&u->readsem);
 
        skb = skb_recv_datagram(sk, flags, noblock, &err);
        if (!skb)
@@ -1602,7 +1575,6 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
                memset(&tmp_scm, 0, sizeof(tmp_scm));
        }
        siocb->scm->creds = *UNIXCREDS(skb);
-       unix_set_secdata(siocb->scm, skb);
 
        if (!(flags & MSG_PEEK))
        {
@@ -1633,7 +1605,7 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
 out_free:
        skb_free_datagram(sk,skb);
 out_unlock:
-       mutex_unlock(&u->readlock);
+       up(&u->readsem);
 out:
        return err;
 }
@@ -1709,7 +1681,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                memset(&tmp_scm, 0, sizeof(tmp_scm));
        }
 
-       mutex_lock(&u->readlock);
+       down(&u->readsem);
 
        do
        {
@@ -1733,7 +1705,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                        err = -EAGAIN;
                        if (!timeo)
                                break;
-                       mutex_unlock(&u->readlock);
+                       up(&u->readsem);
 
                        timeo = unix_stream_data_wait(sk, timeo);
 
@@ -1741,7 +1713,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                                err = sock_intr_errno(timeo);
                                goto out;
                        }
-                       mutex_lock(&u->readlock);
+                       down(&u->readsem);
                        continue;
                }
 
@@ -1807,7 +1779,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                }
        } while (size);
 
-       mutex_unlock(&u->readlock);
+       up(&u->readsem);
        scm_recv(sock, msg, siocb->scm, flags);
 out:
        return copied ? : err;
@@ -1911,8 +1883,6 @@ static unsigned int unix_poll(struct file * file, struct socket *sock, poll_tabl
                mask |= POLLERR;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
                mask |= POLLHUP;
-       if (sk->sk_shutdown & RCV_SHUTDOWN)
-               mask |= POLLRDHUP;
 
        /* readable? */
        if (!skb_queue_empty(&sk->sk_receive_queue) ||