mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 20:51:03 +02:00
kernel/fork: factor out replacing the current MM exe_file
Let's factor the main logic out into replace_mm_exe_file(), such that all mm->exe_file logic is contained in kernel/fork.c. While at it, perform some simple cleanups that are possible now that we're simplifying the individual functions. Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Acked-by: "Eric W. Biederman" <ebiederm@xmission.com> Acked-by: Christian König <christian.koenig@amd.com> Signed-off-by: David Hildenbrand <david@redhat.com>
This commit is contained in:
33
kernel/sys.c
33
kernel/sys.c
@@ -1846,7 +1846,6 @@ SYSCALL_DEFINE1(umask, int, mask)
|
||||
static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
|
||||
{
|
||||
struct fd exe;
|
||||
struct file *old_exe, *exe_file;
|
||||
struct inode *inode;
|
||||
int err;
|
||||
|
||||
@@ -1869,40 +1868,10 @@ static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
|
||||
if (err)
|
||||
goto exit;
|
||||
|
||||
/*
|
||||
* Forbid mm->exe_file change if old file still mapped.
|
||||
*/
|
||||
exe_file = get_mm_exe_file(mm);
|
||||
err = -EBUSY;
|
||||
if (exe_file) {
|
||||
struct vm_area_struct *vma;
|
||||
|
||||
mmap_read_lock(mm);
|
||||
for (vma = mm->mmap; vma; vma = vma->vm_next) {
|
||||
if (!vma->vm_file)
|
||||
continue;
|
||||
if (path_equal(&vma->vm_file->f_path,
|
||||
&exe_file->f_path))
|
||||
goto exit_err;
|
||||
}
|
||||
|
||||
mmap_read_unlock(mm);
|
||||
fput(exe_file);
|
||||
}
|
||||
|
||||
err = 0;
|
||||
/* set the new file, lockless */
|
||||
get_file(exe.file);
|
||||
old_exe = xchg(&mm->exe_file, exe.file);
|
||||
if (old_exe)
|
||||
fput(old_exe);
|
||||
err = replace_mm_exe_file(mm, exe.file);
|
||||
exit:
|
||||
fdput(exe);
|
||||
return err;
|
||||
exit_err:
|
||||
mmap_read_unlock(mm);
|
||||
fput(exe_file);
|
||||
goto exit;
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user