Merge branch 'master'

1 files changed, 3 insertions, 4 deletions

diff --git a/net/socket.c b/net/socket.c
index b13042f68c02..b807f360e02c 100644
--- a/net/socket.c
+++ b/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);
@@ -1455,10 +1456,8 @@ out_put:
 out:
         return err;
 out_fd:
-        put_filp(newfile);
+        fput(newfile);
         put_unused_fd(newfd);
-out_release:
-        sock_release(newsock);
         goto out_put;
 }