Skip to contentSkip to conversation

arm64: add check_wx_pages debugfs for CHECK_WX

PATCH Superseded Phong Tran 6 participants 13 messages Mar 7, 2020 – Apr 24, 2020

Subsystems (3)
lore
Share & tools
lore

Phong Tran

author
#0 lore raw

PATCH 1/1 arm64: add check_wx_pages debugfs for CHECK_WX

follow the suggestion from
https://github.com/KSPP/linux/issues/35

---
 arch/arm64/Kconfig.debug        |  3 ++-
 arch/arm64/include/asm/ptdump.h |  2 ++
 arch/arm64/mm/dump.c            |  1 +
 arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.debug +2 -1
index 1c906d932d6b..be552fa351e2 100644
@@ -48,7 +48,8 @@ config DEBUG_WX
 	  of other unfixed kernel bugs easier.
 
 	  There is no runtime or memory usage effect of this option
-	  once the kernel has booted up - it's a one time check.
+	  once the kernel has booted up - it's a one time check and
+	  can be checked by echo "1" to "check_wx_pages" debugfs in runtime.
 
 	  If in doubt, say "Y".
 
arch/arm64/include/asm/ptdump.h +2 -0
index 38187f74e089..b80d6b4fc508 100644
@@ -24,9 +24,11 @@ struct ptdump_info {
 void ptdump_walk(struct seq_file *s, struct ptdump_info *info);
 #ifdef CONFIG_PTDUMP_DEBUGFS
 void ptdump_debugfs_register(struct ptdump_info *info, const char *name);
+int ptdump_check_wx_init(void);
 #else
 static inline void ptdump_debugfs_register(struct ptdump_info *info,
 					   const char *name) { }
+static inline int ptdump_check_wx_init(void) { return 0; }
 #endif
 void ptdump_check_wx(void);
 #endif /* CONFIG_PTDUMP_CORE */
arch/arm64/mm/dump.c +1 -0
index 860c00ec8bd3..60c99a047763 100644
@@ -378,6 +378,7 @@ static int ptdump_init(void)
 #endif
 	ptdump_initialize();
 	ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
+	ptdump_check_wx_init();
 	return 0;
 }
 device_initcall(ptdump_init);
arch/arm64/mm/ptdump_debugfs.c +18 -0
index 1f2eae3e988b..73cddc12c3c2 100644
@@ -16,3 +16,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name)
 {
 	debugfs_create_file(name, 0400, NULL, info, &ptdump_fops);
 }
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+	if (val != 1ULL)
+		return -EINVAL;
+
+	ptdump_check_wx();
+
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+int ptdump_check_wx_init(void)
+{
+	return debugfs_create_file("check_wx_pages", 0200, NULL,
+				   NULL, &check_wx_fops) ? 0 : -ENOMEM;
+}
Signature · 1 line
2.20.1
#1 lore raw
Quoted 16 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

---
 arch/arm64/Kconfig.debug        |  3 ++-
 arch/arm64/include/asm/ptdump.h |  2 ++
 arch/arm64/mm/dump.c            |  1 +
 arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.debug +0 -0
index 1c906d932d6b..be552fa351e2 100644

arch/arm64/Kconfig.debug config DEBUG_WX · line 52

Quoted 6 lines
arch/arm64/Kconfig.debug +2 -1
@@ -48,7 +48,8 @@ config DEBUG_WX
 	  of other unfixed kernel bugs easier.
 
 	  There is no runtime or memory usage effect of this option
-	  once the kernel has booted up - it's a one time check.
+	  once the kernel has booted up - it's a one time check and
+	  can be checked by echo "1" to "check_wx_pages" debugfs in runtime.

I would suggest it may be better spelling this out a bit more, because at the moment it's a little confusing when the config option is "Warn on W+X mappings at boot", but your change makes it sound like it only happens when you do the echo. Perhaps something like:

There is no runtime or memory usage effect of this option once the kernel has booted up - it's a one time check at boot, and can also be triggered at runtime by echo "1" to "check_wx_pages".

Quoted 9 lines
arch/arm64/Kconfig.debug +0 -0
 	  If in doubt, say "Y".
 
arch/arm64/include/asm/ptdump.h +0 -0
index 38187f74e089..b80d6b4fc508 100644
@@ -24,9 +24,11 @@ struct ptdump_info {
 void ptdump_walk(struct seq_file *s, struct ptdump_info *info);

arch/arm64/include/asm/ptdump.h struct ptdump_info { · line 34

Quoted 10 lines
arch/arm64/include/asm/ptdump.h +2 -0
 #ifdef CONFIG_PTDUMP_DEBUGFS
 void ptdump_debugfs_register(struct ptdump_info *info, const char *name);
+int ptdump_check_wx_init(void);
 #else
 static inline void ptdump_debugfs_register(struct ptdump_info *info,
 					   const char *name) { }
+static inline int ptdump_check_wx_init(void) { return 0; }
 #endif
 void ptdump_check_wx(void);
 #endif /* CONFIG_PTDUMP_CORE */

This is a confusing! Why have you made it dependent on CONFIG_PTDUMP_DEBUGFS?

Well actually I can see why - it's because you've put the new functions in ptdump_debugfs.c which is (currently) only built when CONFIG_PTDUMP_DBEUGFS is enabled.

So you need to either:

a) Ensure the new code is built when CONFIG_PTDUMP_DEBUGFS isn't enabled.

b) Update the Kconfig help text to say that the debugfs file for
triggering a runtime W+X check is only available if CONFIG_PTDUMP_DEBUGFS is also enabled.

Other than the confusion over config symbols this looks good.

Thanks,

Steve

Quoted 39 lines
arch/arm64/mm/dump.c +1 -0
index 860c00ec8bd3..60c99a047763 100644
@@ -378,6 +378,7 @@ static int ptdump_init(void)
 #endif
 	ptdump_initialize();
 	ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
+	ptdump_check_wx_init();
 	return 0;
 }
 device_initcall(ptdump_init);
arch/arm64/mm/ptdump_debugfs.c +18 -0
index 1f2eae3e988b..73cddc12c3c2 100644
@@ -16,3 +16,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name)
 {
 	debugfs_create_file(name, 0400, NULL, info, &ptdump_fops);
 }
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+	if (val != 1ULL)
+		return -EINVAL;
+
+	ptdump_check_wx();
+
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+int ptdump_check_wx_init(void)
+{
+	return debugfs_create_file("check_wx_pages", 0200, NULL,
+				   NULL, &check_wx_fops) ? 0 : -ENOMEM;
+}
reviewer
#2 lore raw
In reply to Phong Tran
Quoted 2 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

That says:

| This should be implemented for all architectures

... so surely this should be in generic code, rahter than being arm64-specific?

Thanks,
Mark.

Quoted 80 lines
---
 arch/arm64/Kconfig.debug        |  3 ++-
 arch/arm64/include/asm/ptdump.h |  2 ++
 arch/arm64/mm/dump.c            |  1 +
 arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.debug +2 -1
index 1c906d932d6b..be552fa351e2 100644
@@ -48,7 +48,8 @@ config DEBUG_WX
 	  of other unfixed kernel bugs easier.
 
 	  There is no runtime or memory usage effect of this option
-	  once the kernel has booted up - it's a one time check.
+	  once the kernel has booted up - it's a one time check and
+	  can be checked by echo "1" to "check_wx_pages" debugfs in runtime.
 
 	  If in doubt, say "Y".
 
arch/arm64/include/asm/ptdump.h +2 -0
index 38187f74e089..b80d6b4fc508 100644
@@ -24,9 +24,11 @@ struct ptdump_info {
 void ptdump_walk(struct seq_file *s, struct ptdump_info *info);
 #ifdef CONFIG_PTDUMP_DEBUGFS
 void ptdump_debugfs_register(struct ptdump_info *info, const char *name);
+int ptdump_check_wx_init(void);
 #else
 static inline void ptdump_debugfs_register(struct ptdump_info *info,
 					   const char *name) { }
+static inline int ptdump_check_wx_init(void) { return 0; }
 #endif
 void ptdump_check_wx(void);
 #endif /* CONFIG_PTDUMP_CORE */
arch/arm64/mm/dump.c +1 -0
index 860c00ec8bd3..60c99a047763 100644
@@ -378,6 +378,7 @@ static int ptdump_init(void)
 #endif
 	ptdump_initialize();
 	ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
+	ptdump_check_wx_init();
 	return 0;
 }
 device_initcall(ptdump_init);
arch/arm64/mm/ptdump_debugfs.c +18 -0
index 1f2eae3e988b..73cddc12c3c2 100644
@@ -16,3 +16,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name)
 {
 	debugfs_create_file(name, 0400, NULL, info, &ptdump_fops);
 }
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+	if (val != 1ULL)
+		return -EINVAL;
+
+	ptdump_check_wx();
+
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+int ptdump_check_wx_init(void)
+{
+	return debugfs_create_file("check_wx_pages", 0200, NULL,
+				   NULL, &check_wx_fops) ? 0 : -ENOMEM;
+}
Signature · 1 line
2.20.1
#3 lore raw
Quoted 82 lines · Mark Rutland
Quoted 2 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

That says:

| This should be implemented for all architectures

... so surely this should be in generic code, rahter than being arm64-specific?

Thanks,
Mark.

Quoted 68 lines
---
 arch/arm64/Kconfig.debug        |  3 ++-
 arch/arm64/include/asm/ptdump.h |  2 ++
 arch/arm64/mm/dump.c            |  1 +
 arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.debug +2 -1
index 1c906d932d6b..be552fa351e2 100644
@@ -48,7 +48,8 @@ config DEBUG_WX
 	  of other unfixed kernel bugs easier.
 
 	  There is no runtime or memory usage effect of this option
-	  once the kernel has booted up - it's a one time check.
+	  once the kernel has booted up - it's a one time check and
+	  can be checked by echo "1" to "check_wx_pages" debugfs in runtime.
 
 	  If in doubt, say "Y".
 
arch/arm64/include/asm/ptdump.h +2 -0
index 38187f74e089..b80d6b4fc508 100644
@@ -24,9 +24,11 @@ struct ptdump_info {
 void ptdump_walk(struct seq_file *s, struct ptdump_info *info);
 #ifdef CONFIG_PTDUMP_DEBUGFS
 void ptdump_debugfs_register(struct ptdump_info *info, const char *name);
+int ptdump_check_wx_init(void);
 #else
 static inline void ptdump_debugfs_register(struct ptdump_info *info,
 					   const char *name) { }
+static inline int ptdump_check_wx_init(void) { return 0; }
 #endif
 void ptdump_check_wx(void);
 #endif /* CONFIG_PTDUMP_CORE */
arch/arm64/mm/dump.c +1 -0
index 860c00ec8bd3..60c99a047763 100644
@@ -378,6 +378,7 @@ static int ptdump_init(void)
 #endif
 	ptdump_initialize();
 	ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
+	ptdump_check_wx_init();
 	return 0;
 }
 device_initcall(ptdump_init);
arch/arm64/mm/ptdump_debugfs.c +9 -0
index 1f2eae3e988b..73cddc12c3c2 100644
@@ -16,3 +16,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name)
 {
 	debugfs_create_file(name, 0400, NULL, info, &ptdump_fops);
 }
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+	if (val != 1ULL)
+		return -EINVAL;
+
+	ptdump_check_wx();
+
+	return 0;
Quoted 8 lines

arch/arm64/mm/ptdump_debugfs.c void ptdump_debugfs_register(struct ptdump_info *info, const char *name) · line 35

Quoted 8 lines
arch/arm64/mm/ptdump_debugfs.c +8 -0
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+int ptdump_check_wx_init(void)
+{
+	return debugfs_create_file("check_wx_pages", 0200, NULL,
+				   NULL, &check_wx_fops) ? 0 : -ENOMEM;

Do not check the return value of this function, especially as it is returning a pointer, not an int!

Just call the function and move on, you should not do anything different if it returns an error or not.

thanks,

greg k-h

#4 lore raw
In reply to Mark Rutland
Quoted 10 lines · Mark Rutland
Quoted 2 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

That says:

| This should be implemented for all architectures

... so surely this should be in generic code, rahter than being arm64-specific?

Not all architectures have implemented CONFIG_DEBUG_WX...

-Kees

Quoted 84 lines

Thanks,
Mark.

Quoted 80 lines
---
 arch/arm64/Kconfig.debug        |  3 ++-
 arch/arm64/include/asm/ptdump.h |  2 ++
 arch/arm64/mm/dump.c            |  1 +
 arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.debug +2 -1
index 1c906d932d6b..be552fa351e2 100644
@@ -48,7 +48,8 @@ config DEBUG_WX
 	  of other unfixed kernel bugs easier.
 
 	  There is no runtime or memory usage effect of this option
-	  once the kernel has booted up - it's a one time check.
+	  once the kernel has booted up - it's a one time check and
+	  can be checked by echo "1" to "check_wx_pages" debugfs in runtime.
 
 	  If in doubt, say "Y".
 
arch/arm64/include/asm/ptdump.h +2 -0
index 38187f74e089..b80d6b4fc508 100644
@@ -24,9 +24,11 @@ struct ptdump_info {
 void ptdump_walk(struct seq_file *s, struct ptdump_info *info);
 #ifdef CONFIG_PTDUMP_DEBUGFS
 void ptdump_debugfs_register(struct ptdump_info *info, const char *name);
+int ptdump_check_wx_init(void);
 #else
 static inline void ptdump_debugfs_register(struct ptdump_info *info,
 					   const char *name) { }
+static inline int ptdump_check_wx_init(void) { return 0; }
 #endif
 void ptdump_check_wx(void);
 #endif /* CONFIG_PTDUMP_CORE */
arch/arm64/mm/dump.c +1 -0
index 860c00ec8bd3..60c99a047763 100644
@@ -378,6 +378,7 @@ static int ptdump_init(void)
 #endif
 	ptdump_initialize();
 	ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
+	ptdump_check_wx_init();
 	return 0;
 }
 device_initcall(ptdump_init);
arch/arm64/mm/ptdump_debugfs.c +18 -0
index 1f2eae3e988b..73cddc12c3c2 100644
@@ -16,3 +16,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name)
 {
 	debugfs_create_file(name, 0400, NULL, info, &ptdump_fops);
 }
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+	if (val != 1ULL)
+		return -EINVAL;
+
+	ptdump_check_wx();
+
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+int ptdump_check_wx_init(void)
+{
+	return debugfs_create_file("check_wx_pages", 0200, NULL,
+				   NULL, &check_wx_fops) ? 0 : -ENOMEM;
+}
Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
reviewer
#5 lore raw
Quoted 5 lines · Kees Cook
Quoted 4 lines · Mark Rutland
Quoted 2 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

Quoted 8 lines
Quoted 6 lines

That says:

| This should be implemented for all architectures

... so surely this should be in generic code, rahter than being arm64-specific?

Not all architectures have implemented CONFIG_DEBUG_WX...

Sure; I assumed the generic code could be gated with:

#ifdef CONFIG_DEBUG_WX
debug_checkwx()
#endif

... or something to that effect, so that the common code could handle all the sysfs bits and ensure that part was consistent.

Thanksm
Mark.

Quoted 90 lines

-Kees

Quoted 84 lines

Thanks,
Mark.

Quoted 80 lines
---
 arch/arm64/Kconfig.debug        |  3 ++-
 arch/arm64/include/asm/ptdump.h |  2 ++
 arch/arm64/mm/dump.c            |  1 +
 arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.debug +2 -1
index 1c906d932d6b..be552fa351e2 100644
@@ -48,7 +48,8 @@ config DEBUG_WX
 	  of other unfixed kernel bugs easier.
 
 	  There is no runtime or memory usage effect of this option
-	  once the kernel has booted up - it's a one time check.
+	  once the kernel has booted up - it's a one time check and
+	  can be checked by echo "1" to "check_wx_pages" debugfs in runtime.
 
 	  If in doubt, say "Y".
 
arch/arm64/include/asm/ptdump.h +2 -0
index 38187f74e089..b80d6b4fc508 100644
@@ -24,9 +24,11 @@ struct ptdump_info {
 void ptdump_walk(struct seq_file *s, struct ptdump_info *info);
 #ifdef CONFIG_PTDUMP_DEBUGFS
 void ptdump_debugfs_register(struct ptdump_info *info, const char *name);
+int ptdump_check_wx_init(void);
 #else
 static inline void ptdump_debugfs_register(struct ptdump_info *info,
 					   const char *name) { }
+static inline int ptdump_check_wx_init(void) { return 0; }
 #endif
 void ptdump_check_wx(void);
 #endif /* CONFIG_PTDUMP_CORE */
arch/arm64/mm/dump.c +1 -0
index 860c00ec8bd3..60c99a047763 100644
@@ -378,6 +378,7 @@ static int ptdump_init(void)
 #endif
 	ptdump_initialize();
 	ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
+	ptdump_check_wx_init();
 	return 0;
 }
 device_initcall(ptdump_init);
arch/arm64/mm/ptdump_debugfs.c +18 -0
index 1f2eae3e988b..73cddc12c3c2 100644
@@ -16,3 +16,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name)
 {
 	debugfs_create_file(name, 0400, NULL, info, &ptdump_fops);
 }
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+	if (val != 1ULL)
+		return -EINVAL;
+
+	ptdump_check_wx();
+
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+int ptdump_check_wx_init(void)
+{
+	return debugfs_create_file("check_wx_pages", 0200, NULL,
+				   NULL, &check_wx_fops) ? 0 : -ENOMEM;
+}
Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
maintainer
#6 lore raw
In reply to Phong Tran
Quoted 10 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

---
 arch/arm64/Kconfig.debug        |  3 ++-
 arch/arm64/include/asm/ptdump.h |  2 ++
 arch/arm64/mm/dump.c            |  1 +
 arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)

Any plans to spin an updated version of this? The review feedback all seemed reasonable to me.

Thanks,

Will

author
#7 lore raw

PATCH v2 1/1 arm64: add check_wx_pages debugfs for CHECK_WX

In reply to Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

---
Change since v1:
- Update the Kconfig help text
- Don't check the return value of debugfs_create_file()
- Tested on QEMU aarch64

root@qemuarm64:~# zcat /proc/config.gz | grep PTDUMP
CONFIG_GENERIC_PTDUMP=y
CONFIG_PTDUMP_CORE=y
CONFIG_PTDUMP_DEBUGFS=y
root@qemuarm64:~# uname -a
Linux qemuarm64 5.7.0-rc2-00001-g20ddb383c313 #3 SMP PREEMPT Tue Apr 21 23:18:56 +07 2020 aarch64 GNU/Linux
root@qemuarm64:~# echo 1 > /sys/kernel/debug/check_wx_pages
[   63.261868] Checked W+X mappings: passed, no W+X pages found
---
 arch/arm64/Kconfig.debug        |  5 ++++-
 arch/arm64/include/asm/ptdump.h |  2 ++
 arch/arm64/mm/dump.c            |  1 +
 arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.debug +4 -1
index a1efa246c9ed..cd82c9d3664a 100644
@@ -48,7 +48,10 @@ config DEBUG_WX
 	  of other unfixed kernel bugs easier.
 
 	  There is no runtime or memory usage effect of this option
-	  once the kernel has booted up - it's a one time check.
+	  once the kernel has booted up - it's a one time check at
+	  boot, and can also be triggered at runtime by echo "1" to
+	  "check_wx_pages". The "check_wx_pages" is available only with
+	  CONFIG_PTDUMP_DEBUGFS is enabled.
 
 	  If in doubt, say "Y".
 
arch/arm64/include/asm/ptdump.h +2 -0
index 38187f74e089..c90a6ec6f59b 100644
@@ -24,9 +24,11 @@ struct ptdump_info {
 void ptdump_walk(struct seq_file *s, struct ptdump_info *info);
 #ifdef CONFIG_PTDUMP_DEBUGFS
 void ptdump_debugfs_register(struct ptdump_info *info, const char *name);
+void ptdump_check_wx_init(void);
 #else
 static inline void ptdump_debugfs_register(struct ptdump_info *info,
 					   const char *name) { }
+static inline void ptdump_check_wx_init(void) { }
 #endif
 void ptdump_check_wx(void);
 #endif /* CONFIG_PTDUMP_CORE */
arch/arm64/mm/dump.c +1 -0
index 860c00ec8bd3..60c99a047763 100644
@@ -378,6 +378,7 @@ static int ptdump_init(void)
 #endif
 	ptdump_initialize();
 	ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
+	ptdump_check_wx_init();
 	return 0;
 }
 device_initcall(ptdump_init);
arch/arm64/mm/ptdump_debugfs.c +18 -0
index d29d722ec3ec..6b0aa16cb17b 100644
@@ -20,3 +20,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name)
 {
 	debugfs_create_file(name, 0400, NULL, info, &ptdump_fops);
 }
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+	if (val != 1ULL)
+		return -EINVAL;
+
+	ptdump_check_wx();
+
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+void ptdump_check_wx_init(void)
+{
+	debugfs_create_file("check_wx_pages", 0200, NULL,
+			NULL, &check_wx_fops) ? 0 : -ENOMEM;
+}
Signature · 1 line
2.20.1
Reviewed-by on v2 1/1
#8 lore raw
Quoted 4 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

I'm fine with this as is, so you can have my

However, if you have time to look at it then it would be good to look at moving the ptdump_check_wx()/debug_checkwx() calls into common code as this should be supported on arm/arm64/powerpc/riscv/x86 as far as I can see. And it's always best to get these things in common code early on rather than letting the architectures diverge.

Also in future it would be good if you include some text in the commit message that explains the purpose/intention of the change rather than just a link. Having a self-contained commit message helps a lot when searching the git history to find out why the code was written the way it is.

Steve

Quoted 91 lines

---
Change since v1:
- Update the Kconfig help text
- Don't check the return value of debugfs_create_file()
- Tested on QEMU aarch64

root@qemuarm64:~# zcat /proc/config.gz | grep PTDUMP
CONFIG_GENERIC_PTDUMP=y
CONFIG_PTDUMP_CORE=y
CONFIG_PTDUMP_DEBUGFS=y
root@qemuarm64:~# uname -a
Linux qemuarm64 5.7.0-rc2-00001-g20ddb383c313 #3 SMP PREEMPT Tue Apr 21 23:18:56 +07 2020 aarch64 GNU/Linux
root@qemuarm64:~# echo 1 > /sys/kernel/debug/check_wx_pages
[   63.261868] Checked W+X mappings: passed, no W+X pages found
---
  arch/arm64/Kconfig.debug        |  5 ++++-
  arch/arm64/include/asm/ptdump.h |  2 ++
  arch/arm64/mm/dump.c            |  1 +
  arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
  4 files changed, 25 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.debug +4 -1
index a1efa246c9ed..cd82c9d3664a 100644
@@ -48,7 +48,10 @@ config DEBUG_WX
  	  of other unfixed kernel bugs easier.
 
  	  There is no runtime or memory usage effect of this option
-	  once the kernel has booted up - it's a one time check.
+	  once the kernel has booted up - it's a one time check at
+	  boot, and can also be triggered at runtime by echo "1" to
+	  "check_wx_pages". The "check_wx_pages" is available only with
+	  CONFIG_PTDUMP_DEBUGFS is enabled.
 
  	  If in doubt, say "Y".
 
arch/arm64/include/asm/ptdump.h +2 -0
index 38187f74e089..c90a6ec6f59b 100644
@@ -24,9 +24,11 @@ struct ptdump_info {
  void ptdump_walk(struct seq_file *s, struct ptdump_info *info);
  #ifdef CONFIG_PTDUMP_DEBUGFS
  void ptdump_debugfs_register(struct ptdump_info *info, const char *name);
+void ptdump_check_wx_init(void);
  #else
  static inline void ptdump_debugfs_register(struct ptdump_info *info,
  					   const char *name) { }
+static inline void ptdump_check_wx_init(void) { }
  #endif
  void ptdump_check_wx(void);
  #endif /* CONFIG_PTDUMP_CORE */
arch/arm64/mm/dump.c +1 -0
index 860c00ec8bd3..60c99a047763 100644
@@ -378,6 +378,7 @@ static int ptdump_init(void)
  #endif
  	ptdump_initialize();
  	ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
+	ptdump_check_wx_init();
  	return 0;
  }
  device_initcall(ptdump_init);
arch/arm64/mm/ptdump_debugfs.c +18 -0
index d29d722ec3ec..6b0aa16cb17b 100644
@@ -20,3 +20,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name)
  {
  	debugfs_create_file(name, 0400, NULL, info, &ptdump_fops);
  }
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+	if (val != 1ULL)
+		return -EINVAL;
+
+	ptdump_check_wx();
+
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+void ptdump_check_wx_init(void)
+{
+	debugfs_create_file("check_wx_pages", 0200, NULL,
+			NULL, &check_wx_fops) ? 0 : -ENOMEM;
+}
reviewer
#9 lore raw
In reply to Phong Tran
Quoted 9 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

---
Change since v1:
- Update the Kconfig help text
- Don't check the return value of debugfs_create_file()
- Tested on QEMU aarch64

As on v1, I think that this should be generic across all architectures with CONFIG_DEBUG_WX. Adding this only on arm64 under CONFIG_PTDUMP_DEBUGFS (which does not generally imply a WX check) doesn't seem right.

Maybe we need a new ARCH_HAS_CHECK_WX config to make that simpler, but that seems simple to me.

Thanks,
Marm.

Quoted 88 lines
root@qemuarm64:~# zcat /proc/config.gz | grep PTDUMP
CONFIG_GENERIC_PTDUMP=y
CONFIG_PTDUMP_CORE=y
CONFIG_PTDUMP_DEBUGFS=y
root@qemuarm64:~# uname -a
Linux qemuarm64 5.7.0-rc2-00001-g20ddb383c313 #3 SMP PREEMPT Tue Apr 21 23:18:56 +07 2020 aarch64 GNU/Linux
root@qemuarm64:~# echo 1 > /sys/kernel/debug/check_wx_pages
[   63.261868] Checked W+X mappings: passed, no W+X pages found
---
 arch/arm64/Kconfig.debug        |  5 ++++-
 arch/arm64/include/asm/ptdump.h |  2 ++
 arch/arm64/mm/dump.c            |  1 +
 arch/arm64/mm/ptdump_debugfs.c  | 18 ++++++++++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
arch/arm64/Kconfig.debug +4 -1
index a1efa246c9ed..cd82c9d3664a 100644
@@ -48,7 +48,10 @@ config DEBUG_WX
 	  of other unfixed kernel bugs easier.
 
 	  There is no runtime or memory usage effect of this option
-	  once the kernel has booted up - it's a one time check.
+	  once the kernel has booted up - it's a one time check at
+	  boot, and can also be triggered at runtime by echo "1" to
+	  "check_wx_pages". The "check_wx_pages" is available only with
+	  CONFIG_PTDUMP_DEBUGFS is enabled.
 
 	  If in doubt, say "Y".
 
arch/arm64/include/asm/ptdump.h +2 -0
index 38187f74e089..c90a6ec6f59b 100644
@@ -24,9 +24,11 @@ struct ptdump_info {
 void ptdump_walk(struct seq_file *s, struct ptdump_info *info);
 #ifdef CONFIG_PTDUMP_DEBUGFS
 void ptdump_debugfs_register(struct ptdump_info *info, const char *name);
+void ptdump_check_wx_init(void);
 #else
 static inline void ptdump_debugfs_register(struct ptdump_info *info,
 					   const char *name) { }
+static inline void ptdump_check_wx_init(void) { }
 #endif
 void ptdump_check_wx(void);
 #endif /* CONFIG_PTDUMP_CORE */
arch/arm64/mm/dump.c +1 -0
index 860c00ec8bd3..60c99a047763 100644
@@ -378,6 +378,7 @@ static int ptdump_init(void)
 #endif
 	ptdump_initialize();
 	ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables");
+	ptdump_check_wx_init();
 	return 0;
 }
 device_initcall(ptdump_init);
arch/arm64/mm/ptdump_debugfs.c +18 -0
index d29d722ec3ec..6b0aa16cb17b 100644
@@ -20,3 +20,21 @@ void ptdump_debugfs_register(struct ptdump_info *info, const char *name)
 {
 	debugfs_create_file(name, 0400, NULL, info, &ptdump_fops);
 }
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+	if (val != 1ULL)
+		return -EINVAL;
+
+	ptdump_check_wx();
+
+	return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+void ptdump_check_wx_init(void)
+{
+	debugfs_create_file("check_wx_pages", 0200, NULL,
+			NULL, &check_wx_fops) ? 0 : -ENOMEM;
+}
Signature · 1 line
2.20.1
maintainer
#10 lore raw
Quoted 11 lines · Mark Rutland
Quoted 9 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

---
Change since v1:
- Update the Kconfig help text
- Don't check the return value of debugfs_create_file()
- Tested on QEMU aarch64

Quoted 7 lines

As on v1, I think that this should be generic across all architectures with CONFIG_DEBUG_WX. Adding this only on arm64 under CONFIG_PTDUMP_DEBUGFS (which does not generally imply a WX check) doesn't seem right.

Maybe we need a new ARCH_HAS_CHECK_WX config to make that simpler, but that seems simple to me.

Agreed. When I asked about respinning, I assumed this would be done in generic code as you requested on the first version. Phong -- do you think you can take a look at that, please?

Quoted 2 lines

Thanks,
Marm.

Wow, employee of the month!

Will

reviewer
#11 lore raw
Quoted 5 lines · Will Deacon
Quoted 2 lines · Mark Rutland

Thanks,
Marm.

Wow, employee of the month!

Muscle-memory has finally defeated me...

Marm.

author
#12 lore raw
In reply to Will Deacon
Quoted 17 lines · Will Deacon
Quoted 16 lines · Mark Rutland
Quoted 9 lines · Phong Tran

follow the suggestion from
https://github.com/KSPP/linux/issues/35

---
Change since v1:
- Update the Kconfig help text
- Don't check the return value of debugfs_create_file()
- Tested on QEMU aarch64

As on v1, I think that this should be generic across all architectures with CONFIG_DEBUG_WX. Adding this only on arm64 under CONFIG_PTDUMP_DEBUGFS (which does not generally imply a WX check) doesn't seem right.

Quoted 7 lines
Quoted 2 lines

Maybe we need a new ARCH_HAS_CHECK_WX config to make that simpler, but that seems simple to me.

Agreed. When I asked about respinning, I assumed this would be done in generic code as you requested on the first version. Phong -- do you think you can take a look at that, please?

sure, plan to make change in mm/ptdump.c with KConfig "ARCH_HAS_CHECK_WX" as suggestion.

Then need align with this patch in PowerPC arch also

https://lore.kernel.org/kernel-hardening/[email protected]/

arch/arm64/Kconfig.debug +1 -0
index a1efa246c9ed..50f18e7ff2ae 100644
@@ -25,6 +25,7 @@ config ARM64_RANDOMIZE_TEXT_OFFSET
 
 config DEBUG_WX
        bool "Warn on W+X mappings at boot"
+       select ARCH_HAS_CHECK_WX
        select PTDUMP_CORE
        ---help---
          Generate a warning if any W+X mappings are found at boot.
mm/Kconfig.debug +3 -0
index 0271b22e063f..40c9ac5a4db2 100644
@@ -138,3 +138,6 @@ config PTDUMP_DEBUGFS
          kernel.
 
          If in doubt, say N.
+
+config ARCH_HAS_CHECK_WX
+       bool
mm/ptdump.c +26 -0
index 26208d0d03b7..8f54db007aaa 100644
@@ -137,3 +137,29 @@ void ptdump_walk_pgd(struct ptdump_state *st, struct mm_struct *mm, pgd_t *pgd)
        /* Flush out the last page */
        st->note_page(st, 0, -1, 0);
 }
+
+#ifdef CONFIG_ARCH_HAS_CHECK_WX
+#include <linux/debugfs.h>
+#include <asm/ptdump.h>
+
+static int check_wx_debugfs_set(void *data, u64 val)
+{
+       if (val != 1ULL)
+               return -EINVAL;
+
+       ptdump_check_wx();
+
+       return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(check_wx_fops, NULL, check_wx_debugfs_set, "%llu\n");
+
+static int ptdump_debugfs_check_wx_init(void)
+{
+       debugfs_create_file("check_wx_pages", 0200, NULL,
+                       NULL, &check_wx_fops) ? 0 : -ENOMEM;
+       return 0;
+}
+
+device_initcall(ptdump_debugfs_check_wx_init);
+#endif

Regards,
Phong.