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

Commit ec6fd8a4 authored by Al Viro's avatar Al Viro
Browse files

report errors in /proc/*/*map* sanely 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ca6b0bf0

fs/proc/base.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -225,15 +225,17 @@ static int check_mem_permission(struct task_struct *task) 
struct mm_struct *mm_for_maps(struct task_struct *task)

struct mm_struct *mm_for_maps(struct task_struct *task)

{

{

	struct mm_struct *mm;

	struct mm_struct *mm;

	int err;





	if (mutex_lock_killable(&task->signal->cred_guard_mutex))

	err =  mutex_lock_killable(&task->signal->cred_guard_mutex);

		return NULL;

	if (err)

		return ERR_PTR(err);





	mm = get_task_mm(task);

	mm = get_task_mm(task);

	if (mm && mm != current->mm &&

	if (mm && mm != current->mm &&

			!ptrace_may_access(task, PTRACE_MODE_READ)) {

			!ptrace_may_access(task, PTRACE_MODE_READ)) {

		mmput(mm);

		mmput(mm);

		mm = NULL;

		mm = ERR_PTR(-EACCES);

	}

	}

	mutex_unlock(&task->signal->cred_guard_mutex);

	mutex_unlock(&task->signal->cred_guard_mutex);

fs/proc/task_mmu.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -119,11 +119,11 @@ static void *m_start(struct seq_file *m, loff_t *pos) 




	priv->task = get_pid_task(priv->pid, PIDTYPE_PID);

	priv->task = get_pid_task(priv->pid, PIDTYPE_PID);

	if (!priv->task)

	if (!priv->task)

		return NULL;

		return ERR_PTR(-ESRCH);





	mm = mm_for_maps(priv->task);

	mm = mm_for_maps(priv->task);

	if (!mm)

	if (!mm || IS_ERR(mm))

		return NULL;

		return mm;

	down_read(&mm->mmap_sem);

	down_read(&mm->mmap_sem);





	tail_vma = get_gate_vma(priv->task);

	tail_vma = get_gate_vma(priv->task);
@@ -728,9 +728,9 @@ static ssize_t pagemap_read(struct file *file, char __user *buf, 
	if (!task)

	if (!task)

		goto out;

		goto out;





	ret = -EACCES;

	mm = mm_for_maps(task);

	mm = mm_for_maps(task);

	if (!mm)

	ret = PTR_ERR(mm);

	if (!mm || IS_ERR(mm))

		goto out_task;

		goto out_task;





	ret = -EINVAL;

	ret = -EINVAL;

fs/proc/task_nommu.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -199,13 +199,13 @@ static void *m_start(struct seq_file *m, loff_t *pos) 
	/* pin the task and mm whilst we play with them */

	/* pin the task and mm whilst we play with them */

	priv->task = get_pid_task(priv->pid, PIDTYPE_PID);

	priv->task = get_pid_task(priv->pid, PIDTYPE_PID);

	if (!priv->task)

	if (!priv->task)

		return NULL;

		return ERR_PTR(-ESRCH);





	mm = mm_for_maps(priv->task);

	mm = mm_for_maps(priv->task);

	if (!mm) {

	if (!mm || IS_ERR(mm)) {

		put_task_struct(priv->task);

		put_task_struct(priv->task);

		priv->task = NULL;

		priv->task = NULL;

		return NULL;

		return mm;

	}

	}

	down_read(&mm->mmap_sem);

	down_read(&mm->mmap_sem);