Commit 59cd0cbc authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Linus Torvalds

Fix race between proc_readdir and remove_proc_entry

Fix the following race:

proc_readdir				remove_proc_entry
============				=================

spin_lock(&proc_subdir_lock);
[choose PDE to start filldir from]
spin_unlock(&proc_subdir_lock);
					spin_lock(&proc_subdir_lock);
					[find PDE]
					[free PDE, refcount is 0]
					spin_unlock(&proc_subdir_lock);
		    /* boom */
if (filldir(dirent, de->name, ...

[de_put on error path --adobriyan]
Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@sw.ru>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7695650a
...@@ -478,14 +478,21 @@ int proc_readdir(struct file * filp, ...@@ -478,14 +478,21 @@ int proc_readdir(struct file * filp,
} }
do { do {
struct proc_dir_entry *next;
/* filldir passes info to user space */ /* filldir passes info to user space */
de_get(de);
spin_unlock(&proc_subdir_lock); spin_unlock(&proc_subdir_lock);
if (filldir(dirent, de->name, de->namelen, filp->f_pos, if (filldir(dirent, de->name, de->namelen, filp->f_pos,
de->low_ino, de->mode >> 12) < 0) de->low_ino, de->mode >> 12) < 0) {
de_put(de);
goto out; goto out;
}
spin_lock(&proc_subdir_lock); spin_lock(&proc_subdir_lock);
filp->f_pos++; filp->f_pos++;
de = de->next; next = de->next;
de_put(de);
de = next;
} while (de); } while (de);
spin_unlock(&proc_subdir_lock); spin_unlock(&proc_subdir_lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment