From: Jessica Yu <jeyu@kernel.org>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Szabolcs Nagy <szabolcs.nagy@arm.com>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Kees Cook <keescook@chromium.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Miroslav Benes <mbenes@suse.cz>,
Mark Rutland <mark.rutland@arm.com>, nd <nd@arm.com>
Subject: Re: [PATCH v2] module: Harden STRICT_MODULE_RWX
Date: Thu, 3 Sep 2020 14:37:40 +0200 [thread overview]
Message-ID: <20200903123739.GA11683@linux-8ccs> (raw)
In-Reply-To: <CAK7LNARc1vjAV5ib1D0LaQA+rNGcE7YwGnp-MrshGD34_7V4WQ@mail.gmail.com>
+++ Masahiro Yamada [31/08/20 19:42 +0900]:
[snipped for brevity]
>Sorry for the delay.
>
>Please try the attached patch.
Hi Masahiro,
Thank you for the patch. Sorry for the delay, I just wanted to report back
after briefly testing your patch. It works great, at the moment I've only
tested with arm64.
I made the following change to arch/arm64/include/asm/module.lds.h:
diff --git a/arch/arm64/include/asm/module.lds.h b/arch/arm64/include/asm/module.lds.h
index 691f15af788e..d8e786e5fcdb 100644
--- a/arch/arm64/include/asm/module.lds.h
+++ b/arch/arm64/include/asm/module.lds.h
@@ -2,6 +2,8 @@
SECTIONS {
.plt (NOLOAD) : { BYTE(0) }
.init.plt (NOLOAD) : { BYTE(0) }
+#ifdef CONFIG_DYNAMIC_FTRACE
.text.ftrace_trampoline (NOLOAD) : { BYTE(0) }
+#endif
}
#endif
Since originally we wanted to include .text.ftrace_trampoline only conditionally.
The resulting scripts/module.lds looks correct with CONFIG_DYNAMIC_FTRACE=y:
SECTIONS {
/DISCARD/ : {
*(.discard)
*(.discard.*)
}
__ksymtab 0 : { *(SORT(___ksymtab+*)) }
__ksymtab_gpl 0 : { *(SORT(___ksymtab_gpl+*)) }
__ksymtab_unused 0 : { *(SORT(___ksymtab_unused+*)) }
__ksymtab_unused_gpl 0 : { *(SORT(___ksymtab_unused_gpl+*)) }
__ksymtab_gpl_future 0 : { *(SORT(___ksymtab_gpl_future+*)) }
__kcrctab 0 : { *(SORT(___kcrctab+*)) }
__kcrctab_gpl 0 : { *(SORT(___kcrctab_gpl+*)) }
__kcrctab_unused 0 : { *(SORT(___kcrctab_unused+*)) }
__kcrctab_unused_gpl 0 : { *(SORT(___kcrctab_unused_gpl+*)) }
__kcrctab_gpl_future 0 : { *(SORT(___kcrctab_gpl_future+*)) }
.init_array 0 : ALIGN(8) { *(SORT(.init_array.*)) *(.init_array) }
__jump_table 0 : ALIGN(8) { KEEP(*(__jump_table)) }
}
SECTIONS {
.plt (NOLOAD) : { BYTE(0) }
.init.plt (NOLOAD) : { BYTE(0) }
.text.ftrace_trampoline (NOLOAD) : { BYTE(0) }
}
And with CONFIG_DYNAMIC_FTRACE=n as well:
SECTIONS {
.plt (NOLOAD) : { BYTE(0) }
.init.plt (NOLOAD) : { BYTE(0) }
}
I will test on more arches in the next days but in the meantime you could add my
Tested-by: Jessica Yu <jeyu@kernel.org>
Thank you for working on this!
next prev parent reply other threads:[~2020-09-03 12:47 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 17:13 [PATCH v2] module: Harden STRICT_MODULE_RWX Peter Zijlstra
2020-04-03 20:31 ` Kees Cook
2020-04-08 15:32 ` Jessica Yu
2020-04-08 15:43 ` [PATCH] module: break nested ARCH_HAS_STRICT_MODULE_RWX and STRICT_MODULE_RWX #ifdefs Jessica Yu
2020-04-08 15:57 ` [PATCH v2] module: Harden STRICT_MODULE_RWX Peter Zijlstra
2020-04-08 16:20 ` Jessica Yu
2020-08-08 8:12 ` Mauro Carvalho Chehab
2020-08-10 9:25 ` Jessica Yu
2020-08-10 15:06 ` Jessica Yu
2020-08-11 14:34 ` Mauro Carvalho Chehab
2020-08-11 14:55 ` peterz
2020-08-11 15:27 ` Mauro Carvalho Chehab
2020-08-11 16:01 ` Jessica Yu
2020-08-11 16:57 ` Will Deacon
2020-08-11 17:59 ` peterz
2020-08-11 21:29 ` Peter Zijlstra
2020-08-12 8:56 ` Ard Biesheuvel
2020-08-12 10:40 ` peterz
2020-08-12 11:41 ` Jessica Yu
2020-08-12 13:14 ` H.J. Lu
2020-08-12 12:56 ` Will Deacon
2020-08-12 14:15 ` Szabolcs Nagy
2020-08-12 16:00 ` Jessica Yu
2020-08-12 16:37 ` Ard Biesheuvel
2020-08-12 16:42 ` Szabolcs Nagy
2020-08-13 9:00 ` Will Deacon
2020-08-12 20:00 ` Peter Zijlstra
2020-08-13 8:36 ` Ard Biesheuvel
2020-08-13 13:04 ` Jessica Yu
2020-08-13 13:07 ` Ard Biesheuvel
2020-08-21 12:20 ` Will Deacon
2020-08-21 12:27 ` Ard Biesheuvel
2020-08-21 12:30 ` Will Deacon
2020-08-22 13:47 ` Ard Biesheuvel
2020-08-24 15:24 ` Jessica Yu
2020-08-25 1:54 ` Masahiro Yamada
2020-08-31 9:46 ` Jessica Yu
2020-08-31 10:42 ` Masahiro Yamada
2020-08-31 13:25 ` Ard Biesheuvel
2020-08-31 15:31 ` Jessica Yu
2020-08-31 15:46 ` Masahiro Yamada
2020-09-03 12:37 ` Jessica Yu [this message]
2020-09-01 12:51 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200903123739.GA11683@linux-8ccs \
--to=jeyu@kernel.org \
--cc=ardb@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mbenes@suse.cz \
--cc=mchehab+huawei@kernel.org \
--cc=nd@arm.com \
--cc=peterz@infradead.org \
--cc=szabolcs.nagy@arm.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.