Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm: ignore MAP_DENYWRITE in ksys_mmap_pgoff()

Browse Source 
Let's also remove masking off MAP_DENYWRITE from ksys_mmap_pgoff():
the last in-tree occurrence of MAP_DENYWRITE is now in LEGACY_MAP_MASK,
which accepts the flag e.g., for MAP_SHARED_VALIDATE; however, the flag
is ignored throughout the kernel now.

Add a comment to LEGACY_MAP_MASK stating that MAP_DENYWRITE is ignored.

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:
David Hildenbrand 2021-04-23 09:38:14 +02:00
parent 8d0920bde5
commit 6128b3af2a
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/mman.h
View File

@ -32,7 +32,8 @@
* The historical set of flags that all mmap implementations implicitly * The historical set of flags that all mmap implementations implicitly
* support when a ->mmap_validate() op is not provided in file_operations. * support when a ->mmap_validate() op is not provided in file_operations.
* *
* MAP_EXECUTABLE is completely ignored throughout the kernel. * MAP_EXECUTABLE and MAP_DENYWRITE are completely ignored throughout the
* kernel.
*/ */
#define LEGACY_MAP_MASK (MAP_SHARED \ #define LEGACY_MAP_MASK (MAP_SHARED \
| MAP_PRIVATE \ | MAP_PRIVATE \

2
mm/mmap.c
View File

@ -1626,8 +1626,6 @@ unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
return PTR_ERR(file); return PTR_ERR(file);
} }
flags &= ~MAP_DENYWRITE;
retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff); retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);
out_fput: out_fput:
if (file) if (file)

2
mm/nommu.c
View File

@ -1296,8 +1296,6 @@ unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
goto out; goto out;
} }
flags &= ~MAP_DENYWRITE;
retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff); retval = vm_mmap_pgoff(file, addr, len, prot, flags, pgoff);
if (file) if (file)