From 43c078860b277014ad78a2902099c616d9774a0c Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Sat, 1 Apr 2006 12:48:36 -0800
Subject: [PATCH] --- yaml --- r: 25026 b: refs/heads/master c:
 9a1875e60e61b563737d8d1fc3876b279710fe93 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/net/socket.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index aecf571f931b..b5f4ea991e9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2722971cbe831117686039d5c334f2c0f560be13
+refs/heads/master: 9a1875e60e61b563737d8d1fc3876b279710fe93
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index bbc80780f45a..b807f360e02c 100644
--- a/trunk/net/socket.c
+++ b/trunk/net/socket.c
@@ -1418,7 +1418,8 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
 	newfd = sock_alloc_fd(&newfile);
 	if (unlikely(newfd < 0)) {
 		err = newfd;
-		goto out_release;
+		sock_release(newsock);
+		goto out_put;
 	}
 
 	err = sock_attach_fd(newsock, newfile);
@@ -1457,8 +1458,6 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
 out_fd:
 	fput(newfile);
 	put_unused_fd(newfd);
-out_release:
-	sock_release(newsock);
 	goto out_put;
 }