diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-01 12:32:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-01 12:32:19 -0700 |
| commit | 4a770e638f531d078b580a5a24412c5e5f8f7ddb (patch) | |
| tree | fde3fdcf9f6fc3bbafaa8ed0964f689cb5b79c57 | |
| parent | d7563ca5bfca53398e100eb74345c5d3ef06bf9d (diff) | |
| parent | 877f919e192a09e77962a13d7165783027dee5fd (diff) | |
| download | staging-4a770e638f531d078b580a5a24412c5e5f8f7ddb.tar.gz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fix from Al Viro:
"Followup to procfs-seq_file series this window"
This fixes a memory leak by making sure that proc seq files release any
private data on close. The 'proc_seq_open' has to be properly paired
with 'proc_seq_release' that releases the extra private data.
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
proc: add proc_seq_release
| -rw-r--r-- | fs/proc/generic.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 6ac1c92997ea2a..bb1c1625b158d0 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -564,11 +564,20 @@ static int proc_seq_open(struct inode *inode, struct file *file) return seq_open(file, de->seq_ops); } +static int proc_seq_release(struct inode *inode, struct file *file) +{ + struct proc_dir_entry *de = PDE(inode); + + if (de->state_size) + return seq_release_private(inode, file); + return seq_release(inode, file); +} + static const struct file_operations proc_seq_fops = { .open = proc_seq_open, .read = seq_read, .llseek = seq_lseek, - .release = seq_release, + .release = proc_seq_release, }; struct proc_dir_entry *proc_create_seq_private(const char *name, umode_t mode, |