linux-kernel - [PATCH 5.15 261/262] proc: fix documentation and description of pagemap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20220307091711.178940042@linuxfoundation.org>
Date:   Mon,  7 Mar 2022 10:20:05 +0100
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel@...r.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        stable@...r.kernel.org, Yun Zhou <yun.zhou@...driver.com>,
        Peter Xu <peterx@...hat.com>, Jonathan Corbet <corbet@....net>,
        Tiberiu A Georgescu <tiberiu.georgescu@...anix.com>,
        Florian Schmidt <florian.schmidt@...anix.com>,
        Ivan Teterevkov <ivan.teterevkov@...anix.com>,
        SeongJae Park <sj@...nel.org>, Yang Shi <shy828301@...il.com>,
        David Hildenbrand <david@...hat.com>,
        Axel Rasmussen <axelrasmussen@...gle.com>,
        Miaohe Lin <linmiaohe@...wei.com>,
        Andrea Arcangeli <aarcange@...hat.com>,
        Colin Cross <ccross@...gle.com>,
        Alistair Popple <apopple@...dia.com>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>
Subject: [PATCH 5.15 261/262] proc: fix documentation and description of pagemap

From: Yun Zhou <yun.zhou@...driver.com>

commit dd21bfa425c098b95ca86845f8e7d1ec1ddf6e4a upstream.

Since bit 57 was exported for uffd-wp write-protected (commit
fb8e37f35a2f: "mm/pagemap: export uffd-wp protection information"),
fixing it can reduce some unnecessary confusion.

Link: https://lkml.kernel.org/r/20220301044538.3042713-1-yun.zhou@windriver.com
Fixes: fb8e37f35a2fe1 ("mm/pagemap: export uffd-wp protection information")
Signed-off-by: Yun Zhou <yun.zhou@...driver.com>
Reviewed-by: Peter Xu <peterx@...hat.com>
Cc: Jonathan Corbet <corbet@....net>
Cc: Tiberiu A Georgescu <tiberiu.georgescu@...anix.com>
Cc: Florian Schmidt <florian.schmidt@...anix.com>
Cc: Ivan Teterevkov <ivan.teterevkov@...anix.com>
Cc: SeongJae Park <sj@...nel.org>
Cc: Yang Shi <shy828301@...il.com>
Cc: David Hildenbrand <david@...hat.com>
Cc: Axel Rasmussen <axelrasmussen@...gle.com>
Cc: Miaohe Lin <linmiaohe@...wei.com>
Cc: Andrea Arcangeli <aarcange@...hat.com>
Cc: Colin Cross <ccross@...gle.com>
Cc: Alistair Popple <apopple@...dia.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
 Documentation/admin-guide/mm/pagemap.rst |    2 +-
 fs/proc/task_mmu.c                       |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- a/Documentation/admin-guide/mm/pagemap.rst
+++ b/Documentation/admin-guide/mm/pagemap.rst
@@ -23,7 +23,7 @@ There are four components to pagemap:
     * Bit  56    page exclusively mapped (since 4.2)
     * Bit  57    pte is uffd-wp write-protected (since 5.13) (see
       :ref:`Documentation/admin-guide/mm/userfaultfd.rst <userfaultfd>`)
-    * Bits 57-60 zero
+    * Bits 58-60 zero
     * Bit  61    page is file-page or shared-anon (since 3.5)
     * Bit  62    page swapped
     * Bit  63    page present
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1582,7 +1582,8 @@ static const struct mm_walk_ops pagemap_
  * Bits 5-54  swap offset if swapped
  * Bit  55    pte is soft-dirty (see Documentation/admin-guide/mm/soft-dirty.rst)
  * Bit  56    page exclusively mapped
- * Bits 57-60 zero
+ * Bit  57    pte is uffd-wp write-protected
+ * Bits 58-60 zero
  * Bit  61    page is file-page or shared-anon
  * Bit  62    page swapped
  * Bit  63    page present