mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio.patch removed from -mm tree
The patch titled
Subject: mremap: don't allow MREMAP_DONTUNMAP on special_mappings and aio
has been removed from the -mm tree. Its filename was
mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Dmitry Safonov <[email protected]>
Subject: mremap: don't allow MREMAP_DONTUNMAP on special_mappings and aio
As kernel expect to see only one of such mappings, any further operations on the VMA-copy may be unexpected by the kernel. Maybe it's being on the safe side, but there doesn't seem to be any expected use-case for this, so restrict it now.
---
arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 2 +- fs/aio.c | 5 ++++- include/linux/mm.h | 2 +- mm/mmap.c | 6 +++++- mm/mremap.c | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-)
arch/x86/kernel/cpu/resctrl/pseudo_lock.c renamed from arch/x86/kernel/cpu/resctrl/pseudo_lock.c~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio +1 -1
@@ -1458,7 +1458,7 @@ static int pseudo_lock_dev_release(strucreturn 0 ; } -static int pseudo_lock_dev_mremap (struct vm_area_struct *area) +static int pseudo_lock_dev_mremap (struct vm_area_struct *area,unsigned long flags) {/* Not supported */ return -EINVAL ;
fs/aio.c renamed from fs/aio.c~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio +4 -1
@@ -323,13 +323,16 @@ static void aio_free_ring(struct kioctx } } -static int aio_ring_mremap (struct vm_area_struct *vma) +static int aio_ring_mremap (struct vm_area_struct *vma,unsigned long flags) {struct file *file = vma->vm_file;struct mm_struct *mm = vma->vm_mm;struct kioctx_table *table;int i, res = -EINVAL ; +if (flags &MREMAP_DONTUNMAP ) +return -EINVAL ; +spin_lock (&mm->ioctx_lock);rcu_read_lock (); table =rcu_dereference (mm->ioctx_table);
include/linux/mm.h renamed from include/linux/mm.h~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio +1 -1
@@ -558,7 +558,7 @@ struct vm_operations_struct {void (*open)(struct vm_area_struct * area);void (*close)(struct vm_area_struct * area);int (*split)(struct vm_area_struct * area,unsigned long addr); -int (*mremap)(struct vm_area_struct * area); +int (*mremap)(struct vm_area_struct *area,unsigned long flags);/* * Called by mprotect() to make driver-specific permission * checks before mprotect() is finalised. The VMA must not
mm/mmap.c renamed from mm/mmap.c~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio +5 -1
@@ -3405,10 +3405,14 @@ static const char *special_mapping_name(return ((struct vm_special_mapping *)vma->vm_private_data)->name; } -static int special_mapping_mremap (struct vm_area_struct *new_vma) +static int special_mapping_mremap (struct vm_area_struct *new_vma, +unsigned long flags) {struct vm_special_mapping *sm = new_vma->vm_private_data; +if (flags &MREMAP_DONTUNMAP ) +return -EINVAL ; +if (WARN_ON_ONCE (current->mm != new_vma->vm_mm))return -EFAULT ;
mm/mremap.c renamed from mm/mremap.c~mremap-dont-allow-mremap_dontunmap-on-special_mappings-and-aio +1 -1
@@ -534,7 +534,7 @@ static unsigned long move_vma(struct vm_if (moved_len < old_len) { err = -ENOMEM ; }else if (vma->vm_ops && vma->vm_ops->mremap) { - err = vma->vm_ops->mremap (new_vma); + err = vma->vm_ops->mremap (new_vma, flags); }if (unlikely (err)) {
_
Patches currently in -mm which might be from [email protected] are