|
Michal Hocko |
be9727 |
From: Seth Jenkins <sethjenkins@google.com>
|
|
Michal Hocko |
be9727 |
Date: Mon, 3 Oct 2022 18:45:31 -0400
|
|
Michal Hocko |
be9727 |
Subject: [PATCH] mm: /proc/pid/smaps_rollup: fix no vma's null-deref
|
|
Michal Hocko |
be9727 |
Patch-mainline: Never, fixed differently
|
|
Michal Hocko |
be9727 |
References: bsc#1207769
|
|
Michal Hocko |
be9727 |
|
|
Michal Hocko |
be9727 |
mhocko@suse.com:
|
|
Michal Hocko |
be9727 |
The upstream has fixed by c4c84f06285e ("fs/proc/task_mmu: stop using linked
|
|
Michal Hocko |
be9727 |
list and highest_vm_end") which is a larger chabge not really suitable for
|
|
Michal Hocko |
be9727 |
backporintg.
|
|
Michal Hocko |
be9727 |
|
|
Michal Hocko |
be9727 |
Commit 258f669e7e88 ("mm: /proc/pid/smaps_rollup: convert to single value
|
|
Michal Hocko |
be9727 |
seq_file") introduced a null-deref if there are no vma's in the task in
|
|
Michal Hocko |
be9727 |
show_smaps_rollup.
|
|
Michal Hocko |
be9727 |
|
|
Michal Hocko |
be9727 |
Fixes: 258f669e7e88 ("mm: /proc/pid/smaps_rollup: convert to single value seq_file")
|
|
Michal Hocko |
be9727 |
Cc: stable@vger.kernel.org
|
|
Michal Hocko |
be9727 |
Signed-off-by: Seth Jenkins <sethjenkins@google.com>
|
|
Michal Hocko |
be9727 |
Acked-by: Michal Hocko <mhocko@suse.com>
|
|
Michal Hocko |
be9727 |
|
|
Michal Hocko |
be9727 |
---
|
|
Michal Hocko |
be9727 |
fs/proc/task_mmu.c | 2 +-
|
|
Michal Hocko |
be9727 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Michal Hocko |
be9727 |
|
|
Michal Hocko |
be9727 |
--- a/fs/proc/task_mmu.c
|
|
Michal Hocko |
be9727 |
+++ b/fs/proc/task_mmu.c
|
|
Michal Hocko |
be9727 |
@@ -876,7 +876,7 @@ static int show_smaps_rollup(struct seq_
|
|
Michal Hocko |
be9727 |
last_vma_end = vma->vm_end;
|
|
Michal Hocko |
be9727 |
}
|
|
Michal Hocko |
be9727 |
|
|
Michal Hocko |
be9727 |
- show_vma_header_prefix(m, priv->mm->mmap->vm_start,
|
|
Michal Hocko |
be9727 |
+ show_vma_header_prefix(m, priv->mm->mmap ? priv->mm->mmap->vm_start : 0,
|
|
Michal Hocko |
be9727 |
last_vma_end, 0, 0, 0, 0);
|
|
Michal Hocko |
be9727 |
seq_pad(m, ' ');
|
|
Michal Hocko |
be9727 |
seq_puts(m, "[rollup]\n");
|