linux-kernel - [PATCH v3] scripts/gdb: replace flags (MS_xyz -> SB

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-next>] [day] [month] [year] [list]

Date:   Tue,  5 Mar 2019 10:30:14 +0000
From:   Kieran Bingham <kieran.bingham@...asonboard.com>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Jan Kiszka <jan.kiszka@...mens.com>,
        Jackie Liu <liuyun01@...inos.cn>,
        Kieran Bingham <kbingham@...nel.org>
Cc:     Felipe Balbi <felipe.balbi@...ux.intel.com>,
        Dan Robertson <danlrobertson89@...il.com>,
        ndesaulniers@...gle.com, linux-kernel@...r.kernel.org,
        stable@...r.kernel.org,
        Kieran Bingham <kieran.bingham@...asonboard.com>
Subject: [PATCH v3] scripts/gdb: replace flags (MS_xyz -> SB_xyz)

From: Jackie Liu <liuyun01@...inos.cn>

Since commit 1751e8a6cb93 ("Rename superblock flags (MS_xyz -> SB_xyz)"),
scripts/gdb should be updated to replace MS_xyz with SB_xyz.

This change didn't directly affect the running operation of scripts/gdb until
commit e262e32d6bde "vfs: Suppress MS_* flag defs within the kernel unless
explicitly enabled" removed the definitions used by constants.py.

Update constants.py.in to utilise the new internal flags, matching the
implementation at fs/proc_namespace.c::show_sb_opts.

Cc: <stable@...r.kernel.org>
Fixes: e262e32d6bde "vfs: Suppress MS_* flag defs within the kernel unless explicitly enabled"
Tested-by: Nick Desaulniers <ndesaulniers@...gle.com>
Tested-by: Kieran Bingham <kieran.bingham@...asonboard.com>
Signed-off-by: Jackie Liu <liuyun01@...inos.cn>
[Kieran: Add fixes tag, reword commit message]
Signed-off-by: Kieran Bingham <kieran.bingham@...asonboard.com>
---
 scripts/gdb/linux/constants.py.in | 12 ++++++------
 scripts/gdb/linux/proc.py         | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/gdb/linux/constants.py.in b/scripts/gdb/linux/constants.py.in
index 7aad82406422..d3319a80788a 100644
--- a/scripts/gdb/linux/constants.py.in
+++ b/scripts/gdb/linux/constants.py.in
@@ -37,12 +37,12 @@
 import gdb
 
 /* linux/fs.h */
-LX_VALUE(MS_RDONLY)
-LX_VALUE(MS_SYNCHRONOUS)
-LX_VALUE(MS_MANDLOCK)
-LX_VALUE(MS_DIRSYNC)
-LX_VALUE(MS_NOATIME)
-LX_VALUE(MS_NODIRATIME)
+LX_VALUE(SB_RDONLY)
+LX_VALUE(SB_SYNCHRONOUS)
+LX_VALUE(SB_MANDLOCK)
+LX_VALUE(SB_DIRSYNC)
+LX_VALUE(SB_NOATIME)
+LX_VALUE(SB_NODIRATIME)
 
 /* linux/mount.h */
 LX_VALUE(MNT_NOSUID)
diff --git a/scripts/gdb/linux/proc.py b/scripts/gdb/linux/proc.py
index 0aebd7565b03..2f01a958eb22 100644
--- a/scripts/gdb/linux/proc.py
+++ b/scripts/gdb/linux/proc.py
@@ -114,11 +114,11 @@ def info_opts(lst, opt):
     return opts
 
 
-FS_INFO = {constants.LX_MS_SYNCHRONOUS: ",sync",
-           constants.LX_MS_MANDLOCK: ",mand",
-           constants.LX_MS_DIRSYNC: ",dirsync",
-           constants.LX_MS_NOATIME: ",noatime",
-           constants.LX_MS_NODIRATIME: ",nodiratime"}
+FS_INFO = {constants.LX_SB_SYNCHRONOUS: ",sync",
+           constants.LX_SB_MANDLOCK: ",mand",
+           constants.LX_SB_DIRSYNC: ",dirsync",
+           constants.LX_SB_NOATIME: ",noatime",
+           constants.LX_SB_NODIRATIME: ",nodiratime"}
 
 MNT_INFO = {constants.LX_MNT_NOSUID: ",nosuid",
             constants.LX_MNT_NODEV: ",nodev",
@@ -184,7 +184,7 @@ values of that process namespace"""
             fstype = superblock['s_type']['name'].string()
             s_flags = int(superblock['s_flags'])
             m_flags = int(vfs['mnt']['mnt_flags'])
-            rd = "ro" if (s_flags & constants.LX_MS_RDONLY) else "rw"
+            rd = "ro" if (s_flags & constants.LX_SB_RDONLY) else "rw"
 
             gdb.write(
                 "{} {} {} {}{}{} 0 0\n"
-- 
2.19.1