linux-kernel - [PATCH] Text Edit Lock - i386 Fix endif CONFIG_DEBUG

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: <20070714233108.GI18674@Krystal>
Date:	Sat, 14 Jul 2007 19:31:08 -0400
From:	Mathieu Desnoyers <mathieu.desnoyers@...ymtl.ca>
To:	akpm@...ux-foundation.org, linux-kernel@...r.kernel.org
Subject: [PATCH] Text Edit Lock - i386 Fix endif CONFIG_DEBUG_RODATA

Text Edit Lock - i386 fix endif CONFIG_DEBUG_RODATA

The #endif would also include kernel_text_unmark().
The replacement empty functions should be static inline.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@...ymtl.ca>
---
 arch/i386/mm/init.c           |    2 +-
 include/asm-i386/cacheflush.h |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

Index: linux-2.6-lttng/arch/i386/mm/init.c
===================================================================
--- linux-2.6-lttng.orig/arch/i386/mm/init.c	2007-07-14 19:24:27.000000000 -0400
+++ linux-2.6-lttng/arch/i386/mm/init.c	2007-07-14 19:24:27.000000000 -0400
@@ -845,7 +845,6 @@ void __kprobes kernel_text_mark_rw(unsig
 	}
 }
 EXPORT_SYMBOL_GPL(kernel_text_mark_rw);
-#endif
 
 void __kprobes kernel_text_unmark(unsigned long address, size_t len)
 {
@@ -862,6 +861,7 @@ void __kprobes kernel_text_unmark(unsign
 	}
 }
 EXPORT_SYMBOL_GPL(kernel_text_unmark);
+#endif
 
 void free_init_pages(char *what, unsigned long begin, unsigned long end)
 {
Index: linux-2.6-lttng/include/asm-i386/cacheflush.h
===================================================================
--- linux-2.6-lttng.orig/include/asm-i386/cacheflush.h	2007-07-14 19:24:36.000000000 -0400
+++ linux-2.6-lttng/include/asm-i386/cacheflush.h	2007-07-14 19:25:04.000000000 -0400
@@ -34,15 +34,13 @@ void kernel_map_pages(struct page *page,
 
 #ifdef CONFIG_DEBUG_RODATA
 void mark_rodata_ro(void);
-#endif
 
-#if defined(CONFIG_DEBUG_RODATA)
 /* mark kernel text pages writable */
 extern void kernel_text_mark_rw(unsigned long address, size_t len);
 extern void kernel_text_unmark(unsigned long address, size_t len);
 #else
-void kernel_text_mark_rw(unsigned long address, size_t len) { }
-void kernel_text_unmark(unsigned long address, size_t len) { }
+static inline void kernel_text_mark_rw(unsigned long address, size_t len) { }
+static inline void kernel_text_unmark(unsigned long address, size_t len) { }
 #endif
 
 #endif /* _I386_CACHEFLUSH_H */
-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/