projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm, mempool: poison elements backed by slab allocator
[firefly-linux-kernel-4.4.55.git]
/
mm
/
mremap.c
diff --git
a/mm/mremap.c
b/mm/mremap.c
index 2dc44b1cb1dfc2f6d644d2d655155e6cfce2bdeb..034e2d3606522bf2a3b550c93052b6bf11278851 100644
(file)
--- a/
mm/mremap.c
+++ b/
mm/mremap.c
@@
-345,25
+345,25
@@
static struct vm_area_struct *vma_to_resize(unsigned long addr,
struct vm_area_struct *vma = find_vma(mm, addr);
if (!vma || vma->vm_start > addr)
struct vm_area_struct *vma = find_vma(mm, addr);
if (!vma || vma->vm_start > addr)
-
goto Efault
;
+
return ERR_PTR(-EFAULT)
;
if (is_vm_hugetlb_page(vma))
if (is_vm_hugetlb_page(vma))
-
goto Einval
;
+
return ERR_PTR(-EINVAL)
;
/* We can't remap across vm area boundaries */
if (old_len > vma->vm_end - addr)
/* We can't remap across vm area boundaries */
if (old_len > vma->vm_end - addr)
-
goto Efault
;
+
return ERR_PTR(-EFAULT)
;
/* Need to be careful about a growing mapping */
if (new_len > old_len) {
unsigned long pgoff;
if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))
/* Need to be careful about a growing mapping */
if (new_len > old_len) {
unsigned long pgoff;
if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))
-
goto Efault
;
+
return ERR_PTR(-EFAULT)
;
pgoff = (addr - vma->vm_start) >> PAGE_SHIFT;
pgoff += vma->vm_pgoff;
if (pgoff + (new_len >> PAGE_SHIFT) < pgoff)
pgoff = (addr - vma->vm_start) >> PAGE_SHIFT;
pgoff += vma->vm_pgoff;
if (pgoff + (new_len >> PAGE_SHIFT) < pgoff)
-
goto Einval
;
+
return ERR_PTR(-EINVAL)
;
}
if (vma->vm_flags & VM_LOCKED) {
}
if (vma->vm_flags & VM_LOCKED) {
@@
-372,29
+372,20
@@
static struct vm_area_struct *vma_to_resize(unsigned long addr,
lock_limit = rlimit(RLIMIT_MEMLOCK);
locked += new_len - old_len;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
lock_limit = rlimit(RLIMIT_MEMLOCK);
locked += new_len - old_len;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
-
goto Eagain
;
+
return ERR_PTR(-EAGAIN)
;
}
if (!may_expand_vm(mm, (new_len - old_len) >> PAGE_SHIFT))
}
if (!may_expand_vm(mm, (new_len - old_len) >> PAGE_SHIFT))
-
goto Enomem
;
+
return ERR_PTR(-ENOMEM)
;
if (vma->vm_flags & VM_ACCOUNT) {
unsigned long charged = (new_len - old_len) >> PAGE_SHIFT;
if (security_vm_enough_memory_mm(mm, charged))
if (vma->vm_flags & VM_ACCOUNT) {
unsigned long charged = (new_len - old_len) >> PAGE_SHIFT;
if (security_vm_enough_memory_mm(mm, charged))
-
goto Efault
;
+
return ERR_PTR(-ENOMEM)
;
*p = charged;
}
return vma;
*p = charged;
}
return vma;
-
-Efault: /* very odd choice for most of the cases, but... */
- return ERR_PTR(-EFAULT);
-Einval:
- return ERR_PTR(-EINVAL);
-Enomem:
- return ERR_PTR(-ENOMEM);
-Eagain:
- return ERR_PTR(-EAGAIN);
}
static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
}
static unsigned long mremap_to(unsigned long addr, unsigned long old_len,