]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
create_pipe_files(): use fput() if allocation of the second file fails
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 9 Jul 2018 06:29:58 +0000 (02:29 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 11 Jul 2018 03:29:03 +0000 (23:29 -0400)
... just use put_pipe_info() to get the pipe->files down to 1 and let
fput()-called pipe_release() do freeing.

Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/pipe.c

index bb0840e234f3bc176d2af120d6ed94ee3720aad0..9405e455f5b1802aa60be89092549bb2e175a5f2 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -771,8 +771,9 @@ int create_pipe_files(struct file **res, int flags)
 
        res[0] = alloc_file(&path, FMODE_READ, &pipefifo_fops);
        if (IS_ERR(res[0])) {
-               err = PTR_ERR(res[0]);
-               goto err_file;
+               put_pipe_info(inode, inode->i_pipe);
+               fput(f);
+               return PTR_ERR(res[0]);
        }
 
        path_get(&path);
@@ -781,8 +782,6 @@ int create_pipe_files(struct file **res, int flags)
        res[1] = f;
        return 0;
 
-err_file:
-       put_filp(f);
 err_dentry:
        free_pipe_info(inode->i_pipe);
        path_put(&path);