]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
fs/proc/task_mmu.c: check the return value of mpol_to_str()
authorChen Gang <gang.chen@asianux.com>
Wed, 11 Sep 2013 21:24:35 +0000 (14:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Sep 2013 22:59:03 +0000 (15:59 -0700)
mpol_to_str() may fail, and not fill the buffer (e.g. -EINVAL), so need
check about it, or buffer may not be zero based, and next seq_printf()
will cause issue.

The failure return need after mpol_cond_put() to match get_vma_policy().

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/proc/task_mmu.c

index 09228639b83dd7970154eba13c69eeec73422e4d..7366e9d63cee7d8658e9fed949a2fe7b22519c6f 100644 (file)
@@ -1402,8 +1402,10 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
        walk.mm = mm;
 
        pol = get_vma_policy(task, vma, vma->vm_start);
-       mpol_to_str(buffer, sizeof(buffer), pol);
+       n = mpol_to_str(buffer, sizeof(buffer), pol);
        mpol_cond_put(pol);
+       if (n < 0)
+               return n;
 
        seq_printf(m, "%08lx %s", vma->vm_start, buffer);