[NETFILTER]: Add helper functions for mass hook registration/unregistration

[linux-2.6] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index b13042f68c022e9ef6e8647ad35055e39b5f52ef..b807f360e02ccc336ad45f606feb92506b21af77 100644 (file)
--- 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;
 }