From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Kees Cook <keescook@chromium.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Andrew Morton <akpm@linux-foundation.org>,
"James E.J. Bottomley" <James.Bottomley@hansenpartnership.com>,
Helge Deller <deller@gmx.de>, Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org,
linux-arch@vger.kernel.org, linux-mm@kvack.org
Subject: Re: [PATCH v2 11/13] lkdtm: Fix lkdtm_EXEC_RODATA()
Date: Sun, 17 Oct 2021 09:50:10 +0200 [thread overview]
Message-ID: <87927aa3-6414-adaa-44f7-b3bf1f664317@csgroup.eu> (raw)
In-Reply-To: <61a3d2c4-4997-c221-3eef-d74aef5ba584@csgroup.eu>
Le 16/10/2021 à 08:41, Christophe Leroy a écrit :
>
>
> Le 15/10/2021 à 23:32, Kees Cook a écrit :
>> On Thu, Oct 14, 2021 at 07:50:00AM +0200, Christophe Leroy wrote:
>>> Behind its location, lkdtm_EXEC_RODATA() executes
>>> lkdtm_rodata_do_nothing() which is a real function,
>>> not a copy of do_nothing().
>>>
>>> So executes it directly instead of using execute_location().
>>>
>>> This is necessary because following patch will fix execute_location()
>>> to use a copy of the function descriptor of do_nothing() and
>>> function descriptor of lkdtm_rodata_do_nothing() might be different.
>>>
>>> And fix displayed addresses by dereferencing the function descriptors.
>>>
>>> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
>>
>> I still don't understand this -- it doesn't look needed at all given the
>> changes in patch 12. (i.e. everything is using
>> dereference_function_descriptor() now)
>
> dereference_function_descriptor() only deals with the function address,
> not the function TOC.
>
> do_nothing() is a function. It has a function descriptor with a given
> address (address of .do_nothing) and a given TOC, say TOC1.
>
> lkdtm_rodata_do_nothing() is another function. It has its own function
> descriptor with a given address (address of .lkdtm_rodata_do_nothing)
> and a given TOC, say TOC2.
>
> If we use execute_location(), it will copy do_nothing() function
> descriptor and change the function address to the address of
> lkdtm_rodata_do_nothing(). So it will call lkdtm_rodata_do_nothing()
> with TOC1 instead of calling it with TOC2.
>
>>
>> Can't this patch be dropped?
>
> It is likely that the TOC will be the same for both functions, and
> anyway those functions are so simple that they don't use the TOC at all,
> so yes it would likely work without this patch but from my point of view
> it is incorrect to call one function with the TOC from the descriptor of
> another function.
>
> If you thing we can take the risk, then I'm happy to drop the patch and
> replace it by
>
> execute_location(dereference_function_descriptor(lkdtm_rodata_do_nothing), CODE_AS_IS)
>
Once we have patch 12 EXEC_RODATA works well on powerpc without this
patch so I will drop this patch for now and will propose something else
as a follow-up to my series.
Christophe
next prev parent reply other threads:[~2021-10-17 7:50 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-14 5:49 [PATCH v2 00/13] Fix LKDTM for PPC64/IA64/PARISC Christophe Leroy
2021-10-14 5:49 ` [PATCH v2 01/13] powerpc: Move 'struct ppc64_opd_entry' back into asm/elf.h Christophe Leroy
2021-10-14 21:26 ` Daniel Axtens
2021-10-15 5:57 ` Nicholas Piggin
2021-10-14 5:49 ` [PATCH v2 02/13] powerpc: Rename 'funcaddr' to 'addr' in 'struct ppc64_opd_entry' Christophe Leroy
2021-10-14 21:45 ` Daniel Axtens
2021-10-15 4:59 ` Christophe Leroy
2021-10-15 6:01 ` Nicholas Piggin
2021-10-14 5:49 ` [PATCH v2 03/13] powerpc: Remove func_descr_t Christophe Leroy
2021-10-14 22:17 ` Daniel Axtens
2021-10-15 5:19 ` Christophe Leroy
2021-10-15 6:11 ` Nicholas Piggin
2021-10-14 5:49 ` [PATCH v2 04/13] powerpc: Prepare func_desc_t for refactorisation Christophe Leroy
2021-10-14 5:49 ` [PATCH v2 05/13] ia64: Rename 'ip' to 'addr' in 'struct fdesc' Christophe Leroy
2021-10-14 5:49 ` [PATCH v2 06/13] asm-generic: Use HAVE_FUNCTION_DESCRIPTORS to define associated stubs Christophe Leroy
2021-10-15 6:16 ` Nicholas Piggin
2021-10-15 6:24 ` Christophe Leroy
2021-10-15 8:02 ` Nicholas Piggin
2021-10-15 11:52 ` Nicholas Piggin
2021-10-14 5:49 ` [PATCH v2 07/13] asm-generic: Define 'func_desc_t' to commonly describe function descriptors Christophe Leroy
2021-10-14 6:52 ` Arnd Bergmann
2021-10-14 5:49 ` [PATCH v2 08/13] asm-generic: Refactor dereference_[kernel]_function_descriptor() Christophe Leroy
2021-10-15 7:00 ` Nicholas Piggin
2021-10-14 5:49 ` [PATCH v2 09/13] lkdtm: Force do_nothing() out of line Christophe Leroy
2021-10-14 5:49 ` [PATCH v2 10/13] lkdtm: Really write into kernel text in WRITE_KERN Christophe Leroy
2021-10-14 5:50 ` [PATCH v2 11/13] lkdtm: Fix lkdtm_EXEC_RODATA() Christophe Leroy
2021-10-15 21:32 ` Kees Cook
2021-10-16 6:41 ` Christophe Leroy
2021-10-17 7:50 ` Christophe Leroy [this message]
2021-10-14 5:50 ` [PATCH v2 12/13] lkdtm: Fix execute_[user]_location() Christophe Leroy
2021-10-15 21:31 ` Kees Cook
2021-10-16 6:42 ` Christophe Leroy
2021-11-16 15:07 ` Christophe Leroy
2021-10-14 5:50 ` [PATCH v2 13/13] lkdtm: Add a test for function descriptors protection Christophe Leroy
2021-10-15 21:35 ` Kees Cook
2021-10-16 6:28 ` Christophe Leroy
2021-10-14 21:35 ` [PATCH v2 00/13] Fix LKDTM for PPC64/IA64/PARISC Daniel Axtens
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=87927aa3-6414-adaa-44f7-b3bf1f664317@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=James.Bottomley@hansenpartnership.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=deller@gmx.de \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox