Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200812125645.GA8675@willie-the-truck> <20200812141557.GQ14398@arm.com>
 <20200812160017.GA30302@linux-8ccs> <CAMj1kXFfSLvujJYk4Em6T+UvAUDW3VX0BibsD43z30Q_TSsehg@mail.gmail.com>
 <20200812200019.GY3982@worktop.programming.kicks-ass.net> <CAMj1kXEn5o_7OOqgcntOPCqBYmpY74OkGqQ_bUBJvHG6Q9GVLA@mail.gmail.com>
 <20200813130422.GA16938@linux-8ccs> <CAMj1kXErCQYNN9r5siGNukc+9KC=QnER8LfFXVfbHdeDivYztg@mail.gmail.com>
 <20200821121959.GC20833@willie-the-truck> <CAMj1kXEyLMQz7+Fmv7i0FAu4x0uDmh7aUpbfuXaqs6k6XGog7w@mail.gmail.com>
 <20200821123036.GA21158@willie-the-truck>
In-Reply-To: <20200821123036.GA21158@willie-the-truck>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Sat, 22 Aug 2020 15:47:04 +0200
Message-ID: <CAMj1kXHgHo59vuua49rAoLfSt36JKSzFMMH+Z=y+3jNjbFPZsg@mail.gmail.com>
Subject: Re: [PATCH v2] module: Harden STRICT_MODULE_RWX
To:     Will Deacon <will@kernel.org>,
        Masahiro Yamada <masahiroy@kernel.org>
Cc:     Jessica Yu <jeyu@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>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

(+ Masahiro)

On Fri, 21 Aug 2020 at 14:30, Will Deacon <will@kernel.org> wrote:
>
> On Fri, Aug 21, 2020 at 02:27:05PM +0200, Ard Biesheuvel wrote:
> > On Fri, 21 Aug 2020 at 14:20, Will Deacon <will@kernel.org> wrote:
> > >
> > > On Thu, Aug 13, 2020 at 03:07:13PM +0200, Ard Biesheuvel wrote:
> > > > On Thu, 13 Aug 2020 at 15:04, Jessica Yu <jeyu@kernel.org> wrote:
> > > > >
> > > > > +++ Ard Biesheuvel [13/08/20 10:36 +0200]:
> > > > > >On Wed, 12 Aug 2020 at 22:00, Peter Zijlstra <peterz@infradead.org> wrote:
> > > > > >>
> > > > > >> On Wed, Aug 12, 2020 at 06:37:57PM +0200, Ard Biesheuvel wrote:
> > > > > >> > I know there is little we can do at this point, apart from ignoring
> > > > > >> > the permissions - perhaps we should just defer the w^x check until
> > > > > >> > after calling module_frob_arch_sections()?
> > > > > >>
> > > > > >> My earlier suggestion was to ignore it for 0-sized sections.
> > > > > >
> > > > > >Only they are 1 byte sections in this case.
> > > > > >
> > > > > >We override the sh_type and sh_flags explicitly for these sections at
> > > > > >module load time, so deferring the check seems like a reasonable
> > > > > >alternative to me.
> > > > >
> > > > > So module_enforce_rwx_sections() is already called after
> > > > > module_frob_arch_sections() - which really baffled me at first, since
> > > > > sh_type and sh_flags should have been set already in
> > > > > module_frob_arch_sections().
> > > > >
> > > > > I added some debug prints to see which section the module code was
> > > > > tripping on, and it was .text.ftrace_trampoline. See this snippet from
> > > > > arm64's module_frob_arch_sections():
> > > > >
> > > > >                 else if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE) &&
> > > > >                          !strcmp(secstrings + sechdrs[i].sh_name,
> > > > >                                  ".text.ftrace_trampoline"))
> > > > >                         tramp = sechdrs + i;
> > > > >
> > > > > Since Mauro's config doesn't have CONFIG_DYNAMIC_FTRACE enabled, tramp
> > > > > is never set here and the if (tramp) check at the end of the function
> > > > > fails, so its section flags are never set, so they remain WAX and fail
> > > > > the rwx check.
> > > >
> > > > Right. Our module.lds does not go through the preprocessor, so we
> > > > cannot add the #ifdef check there currently. So we should either drop
> > > > the IS_ENABLED() check here, or simply rename the section, dropping
> > > > the .text prefix (which doesn't seem to have any significance outside
> > > > this context)
> > > >
> > > > I'll leave it to Will to make the final call here.
> > >
> > > Why don't we just preprocess the linker script, like we do for the main
> > > kernel?
> > >
> >
> > That should work as well, I just haven't checked how straight-forward
> > it is to change that.
>
> Ok, if it's _not_ straightforward, then let's just drop the IS_ENABLED()
> altogether.
>

I played around with this for a while, but failed to get Kbuild to
instantiate $(objtree)/arch/arm64/kernel/module.lds based on
$(srctree)/arch/arm64/kernel/module.lds.S and the cpp_lds_S rule.
Perhaps Masahiro has any suggestions here? Otherwise, let's just drop
the IS_ENABLED() check for now.