From: Philipp Rudo <prudo@linux.vnet.ibm.com>
To: Dave Young <dyoung@redhat.com>
Cc: kexec@lists.infradead.org, linux-s390@vger.kernel.org,
linux-kernel@vger.kernel.org,
Eric Biederman <ebiederm@xmission.com>,
Vivek Goyal <vgoyal@redhat.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Andrew Morton <akpm@linux-foundation.org>,
x86@kernel.org, AKASHI Takahiro <takahiro.akashi@linaro.org>
Subject: Re: [PATCH 09/11] kexec_file: Remove mis-use of sh_offset field
Date: Fri, 9 Mar 2018 11:02:41 +0100 [thread overview]
Message-ID: <20180309110241.00b0d3f3@ThinkPad> (raw)
In-Reply-To: <20180309031420.GA3246@dhcp-128-65.nay.redhat.com>
Hi Dave,
On Fri, 9 Mar 2018 11:14:20 +0800
Dave Young <dyoung@redhat.com> wrote:
> On 02/26/18 at 04:16pm, Philipp Rudo wrote:
> > The current code uses the sh_offset field in purgatory_info->sechdrs to
> > store a pointer to the current load address of the section. Depending
> > whether the section will be loaded or not this is either a pointer into
> > purgatory_info->purgatory_buf or kexec_purgatory. This is not only a
> > violation of the ELF standard but also makes the code very hard to
> > understand as you cannot tell if the memory you are using is read-only or
> > not.
> >
> > Remove this mis-use and store the offset of the section in
> > pugaroty_info->purgatory_buf in sh_offset.
> >
> > Signed-off-by: Philipp Rudo <prudo@linux.vnet.ibm.com>
> > ---
> > arch/x86/kernel/machine_kexec_64.c | 10 ++++++----
> > kernel/kexec_file.c | 33 +++------------------------------
> > 2 files changed, 9 insertions(+), 34 deletions(-)
> >
> > diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
> > index 51667c8b5c9b..41db74bdc88b 100644
> > --- a/arch/x86/kernel/machine_kexec_64.c
> > +++ b/arch/x86/kernel/machine_kexec_64.c
> > @@ -457,13 +457,15 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,
> > * rel[i].r_offset contains byte offset from beginning
> > * of section to the storage unit affected.
> > *
> > - * This is location to update (->sh_offset). This is temporary
> > - * buffer where section is currently loaded. This will finally
> > - * be loaded to a different address later, pointed to by
> > + * This is location to update. This is temporary buffer
> > + * where section is currently loaded. This will finally be
> > + * loaded to a different address later, pointed to by
> > * ->sh_addr. kexec takes care of moving it
> > * (kexec_load_segment()).
> > */
> > - location = (void *)(section->sh_offset + rel[i].r_offset);
> > + location = pi->purgatory_buf;
> > + location += section->sh_offset;
> > + location += rel[i].r_offset;
> >
> > /* Final address of the location */
> > address = section->sh_addr + rel[i].r_offset;
> > diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
> > index 746b91e46e34..25b44d1a664a 100644
> > --- a/kernel/kexec_file.c
> > +++ b/kernel/kexec_file.c
> > @@ -736,28 +736,6 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi,
> > pi->ehdr->e_shnum * sizeof(Elf_Shdr));
> > pi->sechdrs = sechdrs;
> >
> > - /*
> > - * We seem to have multiple copies of sections. First copy is which
> > - * is embedded in kernel in read only section. Some of these sections
> > - * will be copied to a temporary buffer and relocated. And these
> > - * sections will finally be copied to their final destination at
> > - * segment load time.
>
> It would be good to keep above part comment somewhere..
there is a comment in include/linux/kexec.h for the purgatory_info->sechdrs
field saying
Temporary, modifiable buffer for sechdrs used for relocation.
This memory can be freed post image load
When you think this is not enough i can add a comment here like
The section headers in kexec_purgatory are read-only. In order to have them
modifiable make a temporary copy.
What do you think.
Thanks
Philipp
> > - *
> > - * Use ->sh_offset to reflect section address in memory. It will
> > - * point to original read only copy if section is not allocatable.
> > - * Otherwise it will point to temporary copy which will be relocated.
> > - *
> > - * Use ->sh_addr to contain final address of the section where it
> > - * will go during execution time.
> > - */
> > - for (i = 0; i < pi->ehdr->e_shnum; i++) {
> > - if (sechdrs[i].sh_type == SHT_NOBITS)
> > - continue;
> > -
> > - sechdrs[i].sh_offset = (unsigned long)pi->ehdr +
> > - sechdrs[i].sh_offset;
> > - }
> > -
> > offset = 0;
> > bss_addr = kbuf->mem + kbuf->bufsz;
> > kbuf->image->start = pi->ehdr->e_entry;
> > @@ -786,17 +764,12 @@ static int kexec_purgatory_setup_sechdrs(struct purgatory_info *pi,
> > kbuf->image->start += kbuf->mem + offset;
> > }
> >
> > - src = (void *)sechdrs[i].sh_offset;
> > + src = (void *)pi->ehdr + sechdrs[i].sh_offset;
> > dst = pi->purgatory_buf + offset;
> > memcpy(dst, src, sechdrs[i].sh_size);
> >
> > sechdrs[i].sh_addr = kbuf->mem + offset;
> > -
> > - /*
> > - * This section got copied to temporary buffer. Update
> > - * ->sh_offset accordingly.
> > - */
> > - sechdrs[i].sh_offset = (unsigned long)dst;
> > + sechdrs[i].sh_offset = offset;
> > offset += sechdrs[i].sh_size;
> > }
> >
> > @@ -1006,7 +979,7 @@ int kexec_purgatory_get_set_symbol(struct kimage *image, const char *name,
> > return -EINVAL;
> > }
> >
> > - sym_buf = (char *)sec->sh_offset + sym->st_value;
> > + sym_buf = (char *)pi->purgatory_buf + sec->sh_offset + sym->st_value;
> >
> > if (get_value)
> > memcpy((void *)buf, sym_buf, size);
> > --
> > 2.13.5
> >
>
> Thanks
> Dave
>
next prev parent reply other threads:[~2018-03-09 10:02 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-26 15:16 [PATCH 00/11] kexec_file: Clean up purgatory load Philipp Rudo
2018-02-26 15:16 ` [PATCH 01/11] kexec_file: Silence compile warnings Philipp Rudo
2018-02-26 15:16 ` [PATCH 02/11] kexec_file: Remove checks in kexec_purgatory_load Philipp Rudo
2018-02-26 15:16 ` [PATCH 03/11] kexec_file: Make purgatory_info->ehdr const Philipp Rudo
2018-02-26 15:16 ` [PATCH 04/11] kexec_file: Search symbols in read-only kexec_purgatory Philipp Rudo
2018-02-26 15:16 ` [PATCH 05/11] kexec_file: Use read-only sections in arch_kexec_apply_relocations* Philipp Rudo
2018-02-28 15:37 ` kbuild test robot
2018-02-28 16:32 ` kbuild test robot
2018-02-26 15:16 ` [PATCH 06/11] kexec_file: Split up __kexec_load_puragory Philipp Rudo
2018-02-26 15:16 ` [PATCH 07/11] kexec_file: Simplify kexec_purgatory_setup_sechdrs 1 Philipp Rudo
2018-02-28 22:49 ` kbuild test robot
2018-02-26 15:16 ` [PATCH 08/11] kexec_file: Simplify kexec_purgatory_setup_sechdrs 2 Philipp Rudo
2018-03-09 3:18 ` Dave Young
2018-03-09 9:54 ` Philipp Rudo
2018-02-26 15:16 ` [PATCH 09/11] kexec_file: Remove mis-use of sh_offset field Philipp Rudo
2018-03-09 3:14 ` Dave Young
2018-03-09 10:02 ` Philipp Rudo [this message]
2018-03-12 7:42 ` Dave Young
2018-03-12 9:42 ` Philipp Rudo
2018-02-26 15:16 ` [PATCH 10/11] kexec_file: Allow archs to set purgatory load address Philipp Rudo
2018-02-28 15:50 ` kbuild test robot
2018-02-28 16:02 ` kbuild test robot
2018-02-26 15:16 ` [PATCH 11/11] kexec_file: Move purgatories sha256 to common code Philipp Rudo
2018-03-09 4:43 ` Dave Young
2018-03-09 10:11 ` Philipp Rudo
2018-03-09 5:19 ` [PATCH 00/11] kexec_file: Clean up purgatory load Dave Young
2018-03-09 5:33 ` Dave Young
2018-03-09 10:13 ` Philipp Rudo
2018-03-09 14:25 ` Philipp Rudo
2018-03-12 7:40 ` Dave Young
2018-03-14 9:51 ` Philipp Rudo
2018-03-15 7:34 ` Dave Young
2018-03-15 10:13 ` Philipp Rudo
2018-03-16 6:41 ` Dave Young
2018-03-20 9:39 ` Philipp Rudo
2018-03-20 9:49 ` Dave Young
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=20180309110241.00b0d3f3@ThinkPad \
--to=prudo@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=bauerman@linux.vnet.ibm.com \
--cc=dyoung@redhat.com \
--cc=ebiederm@xmission.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mpe@ellerman.id.au \
--cc=schwidefsky@de.ibm.com \
--cc=takahiro.akashi@linaro.org \
--cc=vgoyal@redhat.com \
--cc=x86@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).