lkdtm: Really write into kernel text in WRITE_KERN

WRITE_KERN is supposed to overwrite some kernel text, namely
do_overwritten() function.

But at the time being it overwrites do_overwritten() function
descriptor, not function text.

Fix it by dereferencing the function descriptor to obtain
function text pointer. Export dereference_function_descriptor()
for when LKDTM is built as a module.

And make do_overwritten() noinline so that it is really
do_overwritten() which is called by lkdtm_WRITE_KERN().

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/31e58eaffb5bc51c07d8d4891d1982100ade8cfc.1644928018.git.christophe.leroy@csgroup.eu

diff --git a/drivers/misc/lkdtm/perms.c b/drivers/misc/lkdtm/perms.c
index 60b3b2fe929d8a0a986ad9232439dfaa525f583b..035fcca441f070f476fb60de1432e97c7c803baa 100644 (file)
--- a/drivers/misc/lkdtm/perms.c
+++ b/drivers/misc/lkdtm/perms.c
@@ -10,6 +10,7 @@
 #include <linux/mman.h>
 #include <linux/uaccess.h>
 #include <asm/cacheflush.h>
+#include <asm/sections.h>
 
 /* Whether or not to fill the target memory area with do_nothing(). */
 #define CODE_WRITE     true
@@ -37,7 +38,7 @@ static noinline void do_nothing(void)
 }
 
 /* Must immediately follow do_nothing for size calculuations to work out. */
-static void do_overwritten(void)
+static noinline void do_overwritten(void)
 {
        pr_info("do_overwritten wasn't overwritten!\n");
        return;
@@ -113,8 +114,9 @@ void lkdtm_WRITE_KERN(void)
        size_t size;
        volatile unsigned char *ptr;
 
-       size = (unsigned long)do_overwritten - (unsigned long)do_nothing;
-       ptr = (unsigned char *)do_overwritten;
+       size = (unsigned long)dereference_function_descriptor(do_overwritten) -
+              (unsigned long)dereference_function_descriptor(do_nothing);
+       ptr = dereference_function_descriptor(do_overwritten);
 
        pr_info("attempting bad %zu byte write at %px\n", size, ptr);
        memcpy((void *)ptr, (unsigned char *)do_nothing, size);

diff --git a/kernel/extable.c b/kernel/extable.c
index 394c39b86e3899379a4c36c29e1cccd13633a31b..bda5e976154182c1253aedd4d371aae42328d5af 100644 (file)
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@ -149,6 +149,7 @@ void *dereference_function_descriptor(void *ptr)
                ptr = p;
        return ptr;
 }
+EXPORT_SYMBOL_GPL(dereference_function_descriptor);
 
 void *dereference_kernel_function_descriptor(void *ptr)
 {