summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChunyu Hu <chuhu@redhat.com>2018-06-09 15:51:24 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2018-06-27 20:44:38 -0400
commit877f919e192a09e77962a13d7165783027dee5fd (patch)
treecd5e37a5d4d3fc4483816d929d8c65626ebf1132
parentce397d215ccd07b8ae3f71db689aedb85d56ab40 (diff)
proc: add proc_seq_release
kmemleak reported some memory leak on reading proc files. After adding some debug lines, find that proc_seq_fops is using seq_release as release handler, which won't handle the free of 'private' field of seq_file, while in fact the open handler proc_seq_open could create the private data with __seq_open_private when state_size is greater than zero. So after reading files created with proc_create_seq_private, such as /proc/timer_list and /proc/vmallocinfo, the private mem of a seq_file is not freed. Fix it by adding the paired proc_seq_release as the default release handler of proc_seq_ops instead of seq_release. Fixes: 44414d82cfe0 ("proc: introduce proc_create_seq_private") Reviewed-by: Christoph Hellwig <hch@lst.de> CC: Christoph Hellwig <hch@lst.de> Signed-off-by: Chunyu Hu <chuhu@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/proc/generic.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 6ac1c92997ea..bb1c1625b158 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)
564 return seq_open(file, de->seq_ops); 564 return seq_open(file, de->seq_ops);
565} 565}
566 566
567static int proc_seq_release(struct inode *inode, struct file *file)
568{
569 struct proc_dir_entry *de = PDE(inode);
570
571 if (de->state_size)
572 return seq_release_private(inode, file);
573 return seq_release(inode, file);
574}
575
567static const struct file_operations proc_seq_fops = { 576static const struct file_operations proc_seq_fops = {
568 .open = proc_seq_open, 577 .open = proc_seq_open,
569 .read = seq_read, 578 .read = seq_read,
570 .llseek = seq_lseek, 579 .llseek = seq_lseek,
571 .release = seq_release, 580 .release = proc_seq_release,
572}; 581};
573 582
574struct proc_dir_entry *proc_create_seq_private(const char *name, umode_t mode, 583struct proc_dir_entry *proc_create_seq_private(const char *name, umode_t mode,