Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8bdc59f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

proc: do proper range check on readdir offset 



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.

Cc: stable@kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c78193e9

fs/proc/base.c

+7 −2
Original line number Diff line number Diff line
@@ -3124,11 +3124,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;