From d6b29e7a239705ea66b479da229b09fdacebee56 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Sat, 10 Nov 2007 22:08:30 -0800 Subject: [PATCH] --- yaml --- r: 73548 b: refs/heads/master c: 284b327be2f86cf751316ff344b6945e580e654f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/unix/af_unix.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b5ed45ef05b3..be136eef4181 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c80f1ae9842a8b7985acd0f02efb9828effb05f +refs/heads/master: 284b327be2f86cf751316ff344b6945e580e654f diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c index ab9048ac197f..e835da8fc091 100644 --- a/trunk/net/unix/af_unix.c +++ b/trunk/net/unix/af_unix.c @@ -599,15 +599,14 @@ static struct sock * unix_create1(struct net *net, struct socket *sock) struct sock *sk = NULL; struct unix_sock *u; - if (atomic_read(&unix_nr_socks) >= 2*get_max_files()) + atomic_inc(&unix_nr_socks); + if (atomic_read(&unix_nr_socks) > 2 * get_max_files()) goto out; sk = sk_alloc(net, PF_UNIX, GFP_KERNEL, &unix_proto); if (!sk) goto out; - 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); @@ -625,6 +624,8 @@ static struct sock * unix_create1(struct net *net, struct socket *sock) init_waitqueue_head(&u->peer_wait); unix_insert_socket(unix_sockets_unbound, sk); out: + if (sk == NULL) + atomic_dec(&unix_nr_socks); return sk; }