mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 04:33:26 +02:00
Merge tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux
Pull MAP_DENYWRITE removal from David Hildenbrand: "Remove all in-tree usage of MAP_DENYWRITE from the kernel and remove VM_DENYWRITE. There are some (minor) user-visible changes: - We no longer deny write access to shared libaries loaded via legacy uselib(); this behavior matches modern user space e.g. dlopen(). - We no longer deny write access to the elf interpreter after exec completed, treating it just like shared libraries (which it often is). - We always deny write access to the file linked via /proc/pid/exe: sys_prctl(PR_SET_MM_MAP/EXE_FILE) will fail if write access to the file cannot be denied, and write access to the file will remain denied until the link is effectivel gone (exec, termination, sys_prctl(PR_SET_MM_MAP/EXE_FILE)) -- just as if exec'ing the file. Cross-compiled for a bunch of architectures (alpha, microblaze, i386, s390x, ...) and verified via ltp that especially the relevant tests (i.e., creat07 and execve04) continue working as expected" * tag 'denywrite-for-5.15' of git://github.com/davidhildenbrand/linux: fs: update documentation of get_write_access() and friends mm: ignore MAP_DENYWRITE in ksys_mmap_pgoff() mm: remove VM_DENYWRITE binfmt: remove in-tree usage of MAP_DENYWRITE kernel/fork: always deny write access to current MM exe_file kernel/fork: factor out replacing the current MM exe_file binfmt: don't use MAP_DENYWRITE when loading shared libraries via uselib()
This commit is contained in:
33
kernel/sys.c
33
kernel/sys.c
@@ -1847,7 +1847,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;
|
||||
|
||||
@@ -1870,40 +1869,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