diff options
author | Grazvydas Ignotas <notasas@gmail.com> | 2015-02-13 00:00:19 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-13 03:54:11 +0100 |
commit | 9cb12d7b4ccaa976f97ce0c5fd0f1b6a83bc2a75 (patch) | |
tree | e0a8e02b5cb9296e057f68b4cb8a53398345e189 | |
parent | kernel/cpuset.c: Mark cpuset_init_current_mems_allowed as __init (diff) | |
download | linux-9cb12d7b4ccaa976f97ce0c5fd0f1b6a83bc2a75.tar.xz linux-9cb12d7b4ccaa976f97ce0c5fd0f1b6a83bc2a75.zip |
mm/memory.c: actually remap enough memory
For whatever reason, generic_access_phys() only remaps one page, but
actually allows to access arbitrary size. It's quite easy to trigger
large reads, like printing out large structure with gdb, which leads to a
crash. Fix it by remapping correct size.
Fixes: 28b2ee20c7cb ("access_process_vm device memory infrastructure")
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index f7886ab036e7..99275325f303 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3462,7 +3462,7 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, if (follow_phys(vma, addr, write, &prot, &phys_addr)) return -EINVAL; - maddr = ioremap_prot(phys_addr, PAGE_SIZE, prot); + maddr = ioremap_prot(phys_addr, PAGE_ALIGN(len + offset), prot); if (write) memcpy_toio(maddr + offset, buf, len); else |