Replace use of the legacy vm_flags_t flags with vma_flags_t values when
determining how much of a VMA to dump.
The flags copied into struct core_vma_metadata remain legacy flags as they
are consumed by the binfmt handlers.
No functional change intended.
Signed-off-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
---
fs/coredump.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/coredump.c b/fs/coredump.c
index b25ef2ffbdee..6ebc04421b91 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -1835,15 +1835,15 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
if (always_dump_vma(vma))
goto whole;
- if (vma->vm_flags & VM_DONTDUMP)
+ if (vma_test(vma, VMA_DONTDUMP_BIT))
return 0;
/* support for DAX */
if (vma_is_dax(vma)) {
- if ((vma->vm_flags & VM_SHARED) &&
+ if (vma_test(vma, VMA_SHARED_BIT) &&
COREDUMP_MEMORY_TYPE_INCLUDE(memory_types, DAX_SHARED))
goto whole;
- if (!(vma->vm_flags & VM_SHARED) &&
+ if (!vma_test(vma, VMA_SHARED_BIT) &&
COREDUMP_MEMORY_TYPE_INCLUDE(memory_types, DAX_PRIVATE))
goto whole;
return 0;@@ -1851,21 +1851,21 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
/* Hugetlb memory check */
if (vma_is_hugetlb(vma)) {
- if ((vma->vm_flags & VM_SHARED) &&
+ if (vma_test(vma, VMA_SHARED_BIT) &&
COREDUMP_MEMORY_TYPE_INCLUDE(memory_types, HUGETLB_SHARED))
goto whole;
- if (!(vma->vm_flags & VM_SHARED) &&
+ if (!vma_test(vma, VMA_SHARED_BIT) &&
COREDUMP_MEMORY_TYPE_INCLUDE(memory_types, HUGETLB_PRIVATE))
goto whole;
return 0;
}
/* Do not dump I/O mapped devices or special mappings */
- if (vma->vm_flags & VM_IO)
+ if (vma_test(vma, VMA_IO_BIT))
return 0;
/* By default, dump shared memory if mapped from an anonymous file. */
- if (vma->vm_flags & VM_SHARED) {
+ if (vma_test(vma, VMA_SHARED_BIT)) {
if (file_inode(vma->vm_file)->i_nlink == 0 ?
COREDUMP_MEMORY_TYPE_INCLUDE(memory_types, ANON_SHARED) :
COREDUMP_MEMORY_TYPE_INCLUDE(memory_types, FILE_SHARED))@@ -1888,7 +1888,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
* dump the first page to aid in determining what was mapped here.
*/
if (COREDUMP_MEMORY_TYPE_INCLUDE(memory_types, ELF_HEADERS) &&
- vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {
+ vma->vm_pgoff == 0 && vma_test(vma, VMA_READ_BIT)) {
if ((READ_ONCE(file_inode(vma->vm_file)->i_mode) & 0111) != 0)
return PAGE_SIZE;
--
2.56.0