Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+10
-1
+10
-1
fs/proc/generic.c
+10
-1
fs/proc/generic.c
···
564
564
return seq_open(file, de->seq_ops);
565
565
}
566
566
567
+
static 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
+
567
576
static const struct file_operations proc_seq_fops = {
568
577
.open = proc_seq_open,
569
578
.read = seq_read,
570
579
.llseek = seq_lseek,
571
-
.release = seq_release,
580
+
.release = proc_seq_release,
572
581
};
573
582
574
583
struct proc_dir_entry *proc_create_seq_private(const char *name, umode_t mode,