projects/linux·commit 5b697f86

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

5b697f86 · Linus Torvalds <[email protected]> · 2020-10-11 11:11:35 -07:00

Pull vfs fix from Al Viro:
 "Fixes an obvious bug (memory leak introduced in 5.8)"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  pipe: Fix memory leaks in create_pipe_files()
Commit
5b697f86f9f136d200c9827d6eca0437b7eb96cf
Parents
c120ec12 · 8a018eb5

Merge commit. Changes below are compared with the first parent: c120ec12.

Changes

2 files changed · +11 −6

FileStatusAddDelContent
fs/pipe.cmodified+5−6View file
include/linux/watch_queue.hmodified+6−0View file

fs/pipe.c

View file
diff --git a/fs/pipe.c b/fs/pipe.c
index 117db82..0ac1976 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -894,19 +894,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, "",

include/linux/watch_queue.h

View file
diff --git a/include/linux/watch_queue.h b/include/linux/watch_queue.h
index 5e08db2..c994d1b 100644
--- a/include/linux/watch_queue.h
+++ b/include/linux/watch_queue.h
@@ -122,6 +122,12 @@ static inline void remove_watch_list(struct watch_list *wlist, u64 id)
*/
#define watch_sizeof(STRUCT) (sizeof(STRUCT) << WATCH_INFO_LENGTH__SHIFT)
+#else
+static inline int watch_queue_init(struct pipe_inode_info *pipe)
+{
+ return -ENOPKG;
+}
+
#endif
#endif /* _LINUX_WATCH_QUEUE_H */