hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix get_unmapped_area sanity tests 

As noted by Chris Wright, we need to do the full range of tests regardless
of whether MAP_FIXED is set or not, so re-organize get_unmapped_area()
slightly to do the sanity checks unconditionally.
This commit is contained in:
Linus Torvalds 2005-05-19 22:43:37 -07:00
parent 66e60f9251
commit 07ab67c8d0
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/err.h
View File

@ -13,6 +13,8 @@
* This should be a per-architecture thing, to allow different * This should be a per-architecture thing, to allow different
* error and pointer decisions. * error and pointer decisions.
*/ */
#define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L)
static inline void *ERR_PTR(long error) static inline void *ERR_PTR(long error)
{ {
return (void *) error; return (void *) error;
@ -25,7 +27,7 @@ static inline long PTR_ERR(const void *ptr)
static inline long IS_ERR(const void *ptr) static inline long IS_ERR(const void *ptr)
{ {
return unlikely((unsigned long)ptr > (unsigned long)-1000L); return IS_ERR_VALUE((unsigned long)ptr);
} }
#endif /* _LINUX_ERR_H */ #endif /* _LINUX_ERR_H */

59
mm/mmap.c
View File

@ -1302,37 +1302,40 @@ unsigned long
get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
unsigned long pgoff, unsigned long flags) unsigned long pgoff, unsigned long flags)
{ {
if (flags & MAP_FIXED) { unsigned long ret;
unsigned long ret;
if (addr > TASK_SIZE - len) if (!(flags & MAP_FIXED)) {
return -ENOMEM; unsigned long (*get_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
if (addr & ~PAGE_MASK)
return -EINVAL; get_area = current->mm->get_unmapped_area;
if (file && is_file_hugepages(file)) { if (file && file->f_op && file->f_op->get_unmapped_area)
/* get_area = file->f_op->get_unmapped_area;
* Check if the given range is hugepage aligned, and addr = get_area(file, addr, len, pgoff, flags);
* can be made suitable for hugepages. if (IS_ERR_VALUE(addr))
*/ return addr;
ret = prepare_hugepage_range(addr, len);
} else {
/*
* Ensure that a normal request is not falling in a
* reserved hugepage range. For some archs like IA-64,
* there is a separate region for hugepages.
*/
ret = is_hugepage_only_range(current->mm, addr, len);
}
if (ret)
return -EINVAL;
return addr;
} }
if (file && file->f_op && file->f_op->get_unmapped_area) if (addr > TASK_SIZE - len)
return file->f_op->get_unmapped_area(file, addr, len, return -ENOMEM;
pgoff, flags); if (addr & ~PAGE_MASK)
return -EINVAL;
return current->mm->get_unmapped_area(file, addr, len, pgoff, flags); if (file && is_file_hugepages(file)) {
/*
* Check if the given range is hugepage aligned, and
* can be made suitable for hugepages.
*/
ret = prepare_hugepage_range(addr, len);
} else {
/*
* Ensure that a normal request is not falling in a
* reserved hugepage range. For some archs like IA-64,
* there is a separate region for hugepages.
*/
ret = is_hugepage_only_range(current->mm, addr, len);
}
if (ret)
return -EINVAL;
return addr;
} }
EXPORT_SYMBOL(get_unmapped_area); EXPORT_SYMBOL(get_unmapped_area);