The patch titled
Subject: x86-mm-ptdump-calculate-effective-permissions-correctly-fix
has been added to the -mm tree. Its filename is
x86-mm-ptdump-calculate-effective-permissions-correctly-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/x86-mm-ptdump-calculate-effective-permissions-correctly-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/x86-mm-ptdump-calculate-effective-permissions-correctly-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Steven Price <steven.price@xxxxxxx>
Subject: x86-mm-ptdump-calculate-effective-permissions-correctly-fix
make the assignment conditional on val != 0.
Link: http://lkml.kernel.org/r/430c8ab4-e7cd-6933-dde6-087fac6db872@xxxxxxx
Reported-by: Qian Cai <cai@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/mm/dump_pagetables.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/arch/x86/mm/dump_pagetables.c~x86-mm-ptdump-calculate-effective-permissions-correctly-fix
+++ a/arch/x86/mm/dump_pagetables.c
@@ -282,10 +282,10 @@ static void note_page(struct ptdump_stat
struct seq_file *m = st->seq;
new_prot = val & PTE_FLAGS_MASK;
- new_eff = st->prot_levels[level];
-
if (!val)
new_eff = 0;
+ else
+ new_eff = st->prot_levels[level];
/*
* If we have a "break" in the series, we need to flush the state that
_
Patches currently in -mm which might be from steven.price@xxxxxxx are
x86-mm-ptdump-calculate-effective-permissions-correctly.patch
x86-mm-ptdump-calculate-effective-permissions-correctly-fix.patch
mm-ptdump-expand-type-of-val-in-note_page.patch
