korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

mm: replace __access_remote_vm() write parameter with gup_flags

Browse Source 
This removes the 'write' argument from __access_remote_vm() and replaces
it with 'gup_flags' as use of this function previously silently implied
FOLL_FORCE, whereas after this patch callers explicitly pass this flag.

We make this explicit as use of FOLL_FORCE can result in surprising
behaviour (and hence bugs) within the mm subsystem.

Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Lorenzo Stoakes 2016-10-13 01:20:18 +01:00 committed by Linus Torvalds
parent 9beae1ea89
commit 442486ec10
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mm/memory.c
View File

@ -3869,14 +3869,11 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
* given task for page fault accounting. * given task for page fault accounting.
*/ */
static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
unsigned long addr, void *buf, int len, int write) unsigned long addr, void *buf, int len, unsigned int gup_flags)
{ {
struct vm_area_struct *vma; struct vm_area_struct *vma;
void *old_buf = buf; void *old_buf = buf;
unsigned int flags = FOLL_FORCE; int write = gup_flags & FOLL_WRITE;
if (write)
flags |= FOLL_WRITE;
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
/* ignore errors, just check how much was successfully transferred */ /* ignore errors, just check how much was successfully transferred */
@ -3886,7 +3883,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
struct page *page = NULL; struct page *page = NULL;
ret = get_user_pages_remote(tsk, mm, addr, 1, ret = get_user_pages_remote(tsk, mm, addr, 1,
flags, &page, &vma); gup_flags, &page, &vma);
if (ret <= 0) { if (ret <= 0) {
#ifndef CONFIG_HAVE_IOREMAP_PROT #ifndef CONFIG_HAVE_IOREMAP_PROT
break; break;
@ -3945,7 +3942,12 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
int access_remote_vm(struct mm_struct *mm, unsigned long addr, int access_remote_vm(struct mm_struct *mm, unsigned long addr,
void *buf, int len, int write) void *buf, int len, int write)
{ {
return __access_remote_vm(NULL, mm, addr, buf, len, write); unsigned int flags = FOLL_FORCE;
if (write)
flags |= FOLL_WRITE;
return __access_remote_vm(NULL, mm, addr, buf, len, flags);
} }
/* /*
@ -3958,12 +3960,17 @@ int access_process_vm(struct task_struct *tsk, unsigned long addr,
{ {
struct mm_struct *mm; struct mm_struct *mm;
int ret; int ret;
unsigned int flags = FOLL_FORCE;
mm = get_task_mm(tsk); mm = get_task_mm(tsk);
if (!mm) if (!mm)
return 0; return 0;
ret = __access_remote_vm(tsk, mm, addr, buf, len, write); if (write)
flags |= FOLL_WRITE;
ret = __access_remote_vm(tsk, mm, addr, buf, len, flags);
mmput(mm); mmput(mm);
return ret; return ret;

9
mm/nommu.c
View File

@ -1809,9 +1809,10 @@ void filemap_map_pages(struct fault_env *fe,
EXPORT_SYMBOL(filemap_map_pages); EXPORT_SYMBOL(filemap_map_pages);
static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
unsigned long addr, void *buf, int len, int write) unsigned long addr, void *buf, int len, unsigned int gup_flags)
{ {
struct vm_area_struct *vma; struct vm_area_struct *vma;
int write = gup_flags & FOLL_WRITE;
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
@ -1853,7 +1854,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
int access_remote_vm(struct mm_struct *mm, unsigned long addr, int access_remote_vm(struct mm_struct *mm, unsigned long addr,
void *buf, int len, int write) void *buf, int len, int write)
{ {
return __access_remote_vm(NULL, mm, addr, buf, len, write); return __access_remote_vm(NULL, mm, addr, buf, len,
write ? FOLL_WRITE : 0);
} }
/* /*
@ -1871,7 +1873,8 @@ int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, in
if (!mm) if (!mm)
return 0; return 0;
len = __access_remote_vm(tsk, mm, addr, buf, len, write); len = __access_remote_vm(tsk, mm, addr, buf, len,
write ? FOLL_WRITE : 0);
mmput(mm); mmput(mm);
return len; return len;