Skip to content

Commit

Permalink
[PATCH] proc_readfd_common() race fix
Browse files Browse the repository at this point in the history
Since we drop the rcu_read_lock inside the loop, we can't assume
that files->fdt will remain unchanged (and not freed) between
iterations.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Apr 22, 2008
1 parent ed15243 commit 9b4f526
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions fs/proc/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -1626,7 +1626,6 @@ static int proc_readfd_common(struct file * filp, void * dirent,
unsigned int fd, ino;
int retval;
struct files_struct * files;
struct fdtable *fdt;

retval = -ENOENT;
if (!p)
Expand All @@ -1649,9 +1648,8 @@ static int proc_readfd_common(struct file * filp, void * dirent,
if (!files)
goto out;
rcu_read_lock();
fdt = files_fdtable(files);
for (fd = filp->f_pos-2;
fd < fdt->max_fds;
fd < files_fdtable(files)->max_fds;
fd++, filp->f_pos++) {
char name[PROC_NUMBUF];
int len;
Expand Down

0 comments on commit 9b4f526

Please sign in to comment.