NotificationsYou must be signed in to change notification settings
Fork0
Star2

Commit5b697f8

committed

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

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()

2 parentsc120ec1 +8a018eb commit5b697f8Copy full SHA for 5b697f8

File tree

2 files changed

+11

-6

lines changed

fs
- pipe.c
include/linux
- watch_queue.h

2 files changed

+11

-6

lines changed

`‎fs/pipe.c‎`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -894,19 +894,18 @@ int create_pipe_files(struct file **res, int flags)`
`894`	`894`	`{`
`895`	`895`	`structinode*inode=get_pipe_inode();`
`896`	`896`	`structfile*f;`
	`897`	`+interror;`
`897`	`898`
`898`	`899`	`if (!inode)`
`899`	`900`	`return-ENFILE;`
`900`	`901`
`901`	`902`	`if (flags&O_NOTIFICATION_PIPE) {`
`902`		`-#ifdefCONFIG_WATCH_QUEUE`
`903`		`-if (watch_queue_init(inode->i_pipe)<0) {`
	`903`	`+error=watch_queue_init(inode->i_pipe);`
	`904`	`+if (error) {`
	`905`	`+free_pipe_info(inode->i_pipe);`
`904`	`906`	`iput(inode);`
`905`		`-return-ENOMEM;`
	`907`	`+returnerror;`
`906`	`908`	`}`
`907`		`-#else`
`908`		`-return-ENOPKG;`
`909`		`-#endif`
`910`	`909`	`}`
`911`	`910`
`912`	`911`	`f=alloc_file_pseudo(inode,pipe_mnt,"",`

`‎include/linux/watch_queue.h‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,12 @@ static inline void remove_watch_list(struct watch_list *wlist, u64 id)`
`122`	`122`	`*/`
`123`	`123`	`#definewatch_sizeof(STRUCT) (sizeof(STRUCT) << WATCH_INFO_LENGTH__SHIFT)`
`124`	`124`
	`125`	`+#else`
	`126`	`+staticinlineintwatch_queue_init(structpipe_inode_info*pipe)`
	`127`	`+{`
	`128`	`+return-ENOPKG;`
	`129`	`+}`
	`130`	`+`
`125`	`131`	`#endif`
`126`	`132`
`127`	`133`	`#endif/* _LINUX_WATCH_QUEUE_H */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5b697f8

File tree

2 files changed

2 files changed

`‎fs/pipe.c‎`

`‎include/linux/watch_queue.h‎`

0 commit comments