diff options
| author | Lorenzo Stoakes <lorenzo.stoakes@oracle.com> | 2025-06-16 20:33:22 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-06-17 13:47:22 +0200 |
| commit | b013ed403197f3f8c30ddb3ce66fe05a632b3493 (patch) | |
| tree | f46068df67cab1356c3a4cd19da1e3c08807e8d8 /tools/testing/vma | |
| parent | c6900f227f892b36f9c820e60953fe01a4c1b6fa (diff) | |
| download | linux-next-b013ed403197f3f8c30ddb3ce66fe05a632b3493.tar.gz linux-next-b013ed403197f3f8c30ddb3ce66fe05a632b3493.zip | |
fs: consistently use can_mmap_file() helper
Since commit c84bf6dd2b83 ("mm: introduce new .mmap_prepare() file
callback"), the f_op->mmap() hook has been deprecated in favour of
f_op->mmap_prepare().
Additionally, commit bb666b7c2707 ("mm: add mmap_prepare() compatibility
layer for nested file systems") permits the use of the .mmap_prepare() hook
even in nested filesystems like overlayfs.
There are a number of places where we check only for f_op->mmap - this is
incorrect now mmap_prepare exists, so update all of these to use the
general helper can_mmap_file().
Most notably, this updates the elf logic to allow for the ability to
execute binaries on filesystems which have the .mmap_prepare hook, but
additionally we update nested filesystems.
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Link: https://lore.kernel.org/b68145b609532e62bab603dd9686faa6562046ec.1750099179.git.lorenzo.stoakes@oracle.com
Acked-by: Kees Cook <kees@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'tools/testing/vma')
| -rw-r--r-- | tools/testing/vma/vma_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/vma/vma_internal.h b/tools/testing/vma/vma_internal.h index 7ab04700470f..816e7e057585 100644 --- a/tools/testing/vma/vma_internal.h +++ b/tools/testing/vma/vma_internal.h @@ -1464,7 +1464,7 @@ static int compat_vma_mmap_prepare(struct file *file, } /* Did the driver provide valid mmap hook configuration? */ -static inline bool file_has_valid_mmap_hooks(struct file *file) +static inline bool can_mmap_file(struct file *file) { bool has_mmap = file->f_op->mmap; bool has_mmap_prepare = file->f_op->mmap_prepare; |