---

yaml --- r: 25026 b: refs/heads/master c: 9a1875e h: refs/heads/master v: v3
git-mirror · Apr 1, 2006 · 43c0788 · 43c0788
1 parent 46c9089
commit 43c0788
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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;
 }