Commit cd3f8467 authored by Lorenzo Stoakes's avatar Lorenzo Stoakes Committed by Andrew Morton
Browse files

mm: refactor mm_access() to not return NULL 

mm_access() can return NULL if the mm is not found, but this is handled
the same as an error in all callers, with some translating this into an
-ESRCH error.

Only proc_mem_open() returns NULL if no mm is found, however in this case
it is clearer and makes more sense to explicitly handle the error. 
Additionally we take the opportunity to refactor the function to eliminate
unnecessary nesting.

Simplify things by simply returning -ESRCH if no mm is found - this both
eliminates confusing use of the IS_ERR_OR_NULL() macro, and simplifies
callers which would return -ESRCH by returning this error directly.

[lorenzo.stoakes@oracle.com: prefer neater pointer error comparison]
  Link: https://lkml.kernel.org/r/2fae1834-749a-45e1-8594-5e5979cf7103@lucifer.local
Link: https://lkml.kernel.org/r/20240924201023.193135-1-lorenzo.stoakes@oracle.com


Signed-off-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5e998934

fs/proc/base.c

+14 −12
Original line number Diff line number Diff line
@@ -832,19 +832,21 @@ static const struct file_operations proc_single_file_operations = { 
struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)

{

	struct task_struct *task = get_proc_task(inode);

	struct mm_struct *mm = ERR_PTR(-ESRCH);

	struct mm_struct *mm;



	if (!task)

		return ERR_PTR(-ESRCH);



	if (task) {

	mm = mm_access(task, mode | PTRACE_MODE_FSCREDS);

	put_task_struct(task);



		if (!IS_ERR_OR_NULL(mm)) {

	if (IS_ERR(mm))

		return mm == ERR_PTR(-ESRCH) ? NULL : mm;



	/* ensure this mm_struct can't be freed */

	mmgrab(mm);

	/* but do not pin its memory */

	mmput(mm);

		}

	}



	return mm;

}
@@ -2208,7 +2210,7 @@ static int map_files_d_revalidate(struct dentry *dentry, unsigned int flags) 
		goto out_notask;



	mm = mm_access(task, PTRACE_MODE_READ_FSCREDS);

	if (IS_ERR_OR_NULL(mm))

	if (IS_ERR(mm))

		goto out;



	if (!dname_to_vma_addr(dentry, &vm_start, &vm_end)) {

kernel/fork.c

+3 −2
Original line number Diff line number Diff line
@@ -1546,8 +1546,9 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode) 
		return ERR_PTR(err);



	mm = get_task_mm(task);

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

			!ptrace_may_access(task, mode)) {

	if (!mm) {

		mm = ERR_PTR(-ESRCH);

	} else if (mm != current->mm && !ptrace_may_access(task, mode)) {

		mmput(mm);

		mm = ERR_PTR(-EACCES);

	}

mm/madvise.c

+2 −2
Original line number Diff line number Diff line
@@ -1511,8 +1511,8 @@ SYSCALL_DEFINE5(process_madvise, int, pidfd, const struct iovec __user *, vec, 


	/* Require PTRACE_MODE_READ to avoid leaking ASLR metadata. */

	mm = mm_access(task, PTRACE_MODE_READ_FSCREDS);

	if (IS_ERR_OR_NULL(mm)) {

		ret = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;

	if (IS_ERR(mm)) {

		ret = PTR_ERR(mm);

		goto release_task;

	}

mm/process_vm_access.c

+2 −2
Original line number Diff line number Diff line
@@ -201,8 +201,8 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter, 
	}



	mm = mm_access(task, PTRACE_MODE_ATTACH_REALCREDS);

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

		rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;

	if (IS_ERR(mm)) {

		rc = PTR_ERR(mm);

		/*

		 * Explicitly map EACCES to EPERM as EPERM is a more

		 * appropriate error code for process_vw_readv/writev