Eric Lee / smarc-ti-linux-kernel

13
Download as
Browse Code ยป

Commit 00034998ed036fb69523cb3addd878d855fb0718

Authored by Shiraz Hashim
Committed by Greg Kroah-Hartman
1 parent d2d9e9edf9

mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range 

commit 23aaed6659df9adfabe9c583e67a36b54e21df46 upstream.

walk_page_range() silently skips vma having VM_PFNMAP set, which leads
to undesirable behaviour at client end (who called walk_page_range).
Userspace applications get the wrong data, so the effect is like just
confusing users (if the applications just display the data) or sometimes
killing the processes (if the applications do something with
misunderstanding virtual addresses due to the wrong data.)

For example for pagemap_read, when no callbacks are called against
VM_PFNMAP vma, pagemap_read may prepare pagemap data for next virtual
address range at wrong index.

Eventually userspace may get wrong pagemap data for a task.
Corresponding to a VM_PFNMAP marked vma region, kernel may report
mappings from subsequent vma regions.  User space in turn may account
more pages (than really are) to the task.

In my case I was using procmem, procrack (Android utility) which uses
pagemap interface to account RSS pages of a task.  Due to this bug it
was giving a wrong picture for vmas (with VM_PFNMAP set).

Fixes: a9ff785e4437 ("mm/pagewalk.c: walk_page_range should avoid VM_PFNMAP areas")
Signed-off-by: Shiraz Hashim <shashim@codeaurora.org>
Acked-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff

... ... @@ -199,7 +199,10 @@
199 199 */
200 200 if ((vma->vm_start <= addr) &&
201 201 (vma->vm_flags & VM_PFNMAP)) {
202   - next = vma->vm_end;
  202 + if (walk->pte_hole)
  203 + err = walk->pte_hole(addr, next, walk);
  204 + if (err)
  205 + break;
203 206 pgd = pgd_offset(walk->mm, next);
204 207 continue;
205 208 }