From: Jessica Yu <jeyu@kernel.org>
To: Jiri Kosina <jikos@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Miroslav Benes <mbenes@suse.cz>, Petr Mladek <pmladek@suse.com>,
Joe Lawrence <joe.lawrence@redhat.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the livepatching tree with the modules tree
Date: Fri, 5 Jun 2020 09:37:17 +0200 [thread overview]
Message-ID: <20200605073717.GA10481@linux-8ccs.fritz.box> (raw)
In-Reply-To: <nycvar.YFH.7.76.2006050855290.13242@cbobk.fhfr.pm>
+++ Jiri Kosina [05/06/20 08:56 +0200]:
>On Fri, 5 Jun 2020, Stephen Rothwell wrote:
>
>> > Today's linux-next merge of the livepatching tree got a conflict in:
>> >
>> > kernel/module.c
>> >
>> > between commits:
>> >
>> > db991af02f11 ("module: break nested ARCH_HAS_STRICT_MODULE_RWX and STRICT_MODULE_RWX #ifdefs")
>> > 5c3a7db0c7ec ("module: Harden STRICT_MODULE_RWX")
>> >
>> > from the modules tree and commit:
>> >
>> > e6eff4376e28 ("module: Make module_enable_ro() static again")
>> >
>> > from the livepatching tree.
>> >
>> > diff --cc kernel/module.c
>> > index c69291362676,a26343ea4d50..000000000000
>> > --- a/kernel/module.c
>> > +++ b/kernel/module.c
>> > @@@ -2055,29 -2023,20 +2042,30 @@@ static void module_enable_nx(const stru
>> > frob_writable_data(&mod->init_layout, set_memory_nx);
>> > }
>> >
>> > +static int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
>> > + char *secstrings, struct module *mod)
>> > +{
>> > + const unsigned long shf_wx = SHF_WRITE|SHF_EXECINSTR;
>> > + int i;
>> > +
>> > + for (i = 0; i < hdr->e_shnum; i++) {
>> > + if ((sechdrs[i].sh_flags & shf_wx) == shf_wx)
>> > + return -ENOEXEC;
>> > + }
>> > +
>> > + return 0;
>> > +}
>> > +
>> > #else /* !CONFIG_STRICT_MODULE_RWX */
>> > +/* module_{enable,disable}_ro() stubs are in module.h */
>> > static void module_enable_nx(const struct module *mod) { }
>> > + static void module_enable_ro(const struct module *mod, bool after_init) {}
>> > -#endif /* CONFIG_STRICT_MODULE_RWX */
>> > -static void module_enable_x(const struct module *mod)
>> > +static int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
>> > + char *secstrings, struct module *mod)
>> > {
>> > - frob_text(&mod->core_layout, set_memory_x);
>> > - frob_text(&mod->init_layout, set_memory_x);
>> > + return 0;
>> > }
>> > -#else /* !CONFIG_ARCH_HAS_STRICT_MODULE_RWX */
>> > -static void module_enable_nx(const struct module *mod) { }
>> > -static void module_enable_x(const struct module *mod) { }
>> > -#endif /* CONFIG_ARCH_HAS_STRICT_MODULE_RWX */
>> > -
>> > +#endif /* CONFIG_STRICT_MODULE_RWX */
>> >
>> > #ifdef CONFIG_LIVEPATCH
>> > /*
>>
>> This is now a conflict between the modules tree and Linus' tree.
>
>I've made Linus aware of this coming when sending livepatching tree, but
>given the fact that the modules tree hasn't been merged yet, Jessica, I
>believe it'd make sense to point it out again once sending your tree.
Yep, will do. Thanks!
prev parent reply other threads:[~2020-06-05 7:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 8:05 linux-next: manual merge of the livepatching tree with the modules tree Stephen Rothwell
2020-05-11 11:43 ` Miroslav Benes
2020-06-05 4:45 ` Stephen Rothwell
2020-06-05 6:56 ` Jiri Kosina
2020-06-05 7:37 ` Jessica Yu [this message]
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=20200605073717.GA10481@linux-8ccs.fritz.box \
--to=jeyu@kernel.org \
--cc=jikos@kernel.org \
--cc=joe.lawrence@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=sfr@canb.auug.org.au \
/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.