diff options
| author | Qian Cai <cai@redhat.com> | 2020-10-01 08:50:55 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2020-10-01 09:40:35 -0400 |
| commit | 8a018eb55e3ac033592afbcb476b0ffe64465b12 (patch) | |
| tree | bd8bac805f42321871049858655790092ea623ae /fs/pipe.c | |
| parent | 933a3752babcf6513117d5773d2b70782d6ad149 (diff) | |
| download | linux-stable-8a018eb55e3ac033592afbcb476b0ffe64465b12.tar.gz linux-stable-8a018eb55e3ac033592afbcb476b0ffe64465b12.tar.bz2 linux-stable-8a018eb55e3ac033592afbcb476b0ffe64465b12.zip | |
pipe: Fix memory leaks in create_pipe_files()
Calling pipe2() with O_NOTIFICATION_PIPE could results in memory
leaks unless watch_queue_init() is successful.
In case of watch_queue_init() failure in pipe2() we are left
with inode and pipe_inode_info instances that need to be freed. That
failure exit has been introduced in commit c73be61cede5 ("pipe: Add
general notification queue support") and its handling should've been
identical to nearby treatment of alloc_file_pseudo() failures - it
is dealing with the same situation. As it is, the mainline kernel
leaks in that case.
Another problem is that CONFIG_WATCH_QUEUE and !CONFIG_WATCH_QUEUE
cases are treated differently (and the former leaks just pipe_inode_info,
the latter - both pipe_inode_info and inode).
Fixed by providing a dummy wacth_queue_init() in !CONFIG_WATCH_QUEUE
case and by having failures of wacth_queue_init() handled the same way
we handle alloc_file_pseudo() ones.
Fixes: c73be61cede5 ("pipe: Add general notification queue support")
Signed-off-by: Qian Cai <cai@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index 60dbee457143..f5d74ba1bf8c 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -913,19 +913,18 @@ int create_pipe_files(struct file **res, int flags) { struct inode *inode = get_pipe_inode(); struct file *f; + int error; if (!inode) return -ENFILE; if (flags & O_NOTIFICATION_PIPE) { -#ifdef CONFIG_WATCH_QUEUE - if (watch_queue_init(inode->i_pipe) < 0) { + error = watch_queue_init(inode->i_pipe); + if (error) { + free_pipe_info(inode->i_pipe); iput(inode); - return -ENOMEM; + return error; } -#else - return -ENOPKG; -#endif } f = alloc_file_pseudo(inode, pipe_mnt, "", |