diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-18 10:36:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-21 14:32:53 -0700 |
| commit | a506a5b9282e4b944ed314d2b30ce387c44ff9fe (patch) | |
| tree | 3f132b8344f0fbefb1739d4e049fd166426702e3 /fs/proc | |
| parent | c8b265db1e63fdb296ec2721f5c1473c44bc4dc5 (diff) | |
proc: do proper range check on readdir offset
commit d8bdc59f215e62098bc5b4256fd9928bf27053a1 upstream.
Rather than pass in some random truncated offset to the pid-related
functions, check that the offset is in range up-front.
This is just cleanup, the previous commit fixed the real problem.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/base.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index d49c4b5d2c3..71a85d80f83 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -3066,11 +3066,16 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi /* for the /proc/ directory itself, after non-process stuff has been done */ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir) { - unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; - struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); + unsigned int nr; + struct task_struct *reaper; struct tgid_iter iter; struct pid_namespace *ns; + if (filp->f_pos >= PID_MAX_LIMIT + TGID_OFFSET) + goto out_no_task; + nr = filp->f_pos - FIRST_PROCESS_ENTRY; + + reaper = get_proc_task(filp->f_path.dentry->d_inode); if (!reaper) goto out_no_task; |