diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2018-07-09 08:29:58 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-07-11 05:29:03 +0200 |
| commit | b10a4a9f7695335bd2bb19bffdda7fbefbc6581f (patch) | |
| tree | da3e64cb16b4f34bcc25b2155406d31720b5a611 /fs/pipe.c | |
| parent | turn filp_clone_open() into inline wrapper for dentry_open() (diff) | |
| download | linux-b10a4a9f7695335bd2bb19bffdda7fbefbc6581f.tar.xz linux-b10a4a9f7695335bd2bb19bffdda7fbefbc6581f.zip | |
create_pipe_files(): use fput() if allocation of the second file fails
... 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>
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index bb0840e234f3..9405e455f5b1 100644 --- 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); |