diff mbox series

[v3] ld.so: Initialize bootstrap_map.l_ld_readonly [BZ #28340]

Message ID 20211018180024.2009071-1-hjl.tools@gmail.com
State Superseded
Headers show
Series [v3] ld.so: Initialize bootstrap_map.l_ld_readonly [BZ #28340] | expand

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

H.J. Lu Oct. 18, 2021, 6 p.m. UTC
Before calling elf_get_dynamic_info to get dynamic info in bootstrap_map,
initalize bootstrap_map.l_ld_readonly with BOOTSTRAP_MAP_RO_DYN_SECTION.

This updates BZ #28340 fix.
---
 elf/rtld.c                       | 1 +
 sysdeps/generic/dl-relocate-ld.h | 3 +++
 sysdeps/mips/dl-relocate-ld.h    | 3 +++
 sysdeps/riscv/dl-relocate-ld.h   | 4 ++++
 4 files changed, 11 insertions(+)

Comments

H.J. Lu Oct. 18, 2021, 6:06 p.m. UTC | #1
On Mon, Oct 18, 2021 at 11:00 AM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> Before calling elf_get_dynamic_info to get dynamic info in bootstrap_map,
> initalize bootstrap_map.l_ld_readonly with BOOTSTRAP_MAP_RO_DYN_SECTION.
>
> This updates BZ #28340 fix.
> ---
>  elf/rtld.c                       | 1 +
>  sysdeps/generic/dl-relocate-ld.h | 3 +++
>  sysdeps/mips/dl-relocate-ld.h    | 3 +++
>  sysdeps/riscv/dl-relocate-ld.h   | 4 ++++
>  4 files changed, 11 insertions(+)
>
> diff --git a/elf/rtld.c b/elf/rtld.c
> index c66a1d00bc..51a471e6b7 100644
> --- a/elf/rtld.c
> +++ b/elf/rtld.c
> @@ -547,6 +547,7 @@ _dl_start (void *arg)
>
>    /* Read our own dynamic section and fill in the info array.  */
>    bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic ();
> +  bootstrap_map.l_ld_readonly = BOOTSTRAP_MAP_RO_DYN_SECTION;
>    elf_get_dynamic_info (&bootstrap_map, true, false);
>
>  #if NO_TLS_OFFSET != 0
> diff --git a/sysdeps/generic/dl-relocate-ld.h b/sysdeps/generic/dl-relocate-ld.h
> index 5fae206db9..09c7ba0448 100644
> --- a/sysdeps/generic/dl-relocate-ld.h
> +++ b/sysdeps/generic/dl-relocate-ld.h
> @@ -19,6 +19,9 @@
>  #ifndef _DL_RELOCATE_LD_H
>  #define _DL_RELOCATE_LD_H
>
> +/* The dynamic section in bootstrap_map is writable.  */
> +#define BOOTSTRAP_MAP_RO_DYN_SECTION 0
> +
>  /* Return true if dynamic section in the shared library L should be
>     relocated.  */
>
> diff --git a/sysdeps/mips/dl-relocate-ld.h b/sysdeps/mips/dl-relocate-ld.h
> index 0c18d9a567..2c4edbe9f4 100644
> --- a/sysdeps/mips/dl-relocate-ld.h
> +++ b/sysdeps/mips/dl-relocate-ld.h
> @@ -19,6 +19,9 @@
>  #ifndef _DL_RELOCATE_LD_H
>  #define _DL_RELOCATE_LD_H
>
> +/* The dynamic section in bootstrap_map is readonly.  */
> +#define BOOTSTRAP_MAP_RO_DYN_SECTION 1
> +
>  /* Return true if dynamic section in the shared library L should be
>     relocated.  */
>
> diff --git a/sysdeps/riscv/dl-relocate-ld.h b/sysdeps/riscv/dl-relocate-ld.h
> index 10327454b1..240f85b79e 100644
> --- a/sysdeps/riscv/dl-relocate-ld.h
> +++ b/sysdeps/riscv/dl-relocate-ld.h
> @@ -19,6 +19,10 @@
>  #ifndef _DL_RELOCATE_LD_H
>  #define _DL_RELOCATE_LD_H
>
> +/* The dynamic section in bootstrap_map is writable.  This is ignored
> +   on RISC-V.  */
> +#define BOOTSTRAP_MAP_RO_DYN_SECTION 0
> +
>  /* Return true if dynamic section in the shared library L should be
>     relocated.  */
>
> --
> 2.32.0
>

This patch is wrong.  Don't use it.
H.J. Lu Oct. 18, 2021, 6:38 p.m. UTC | #2
On Mon, Oct 18, 2021 at 11:06 AM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> On Mon, Oct 18, 2021 at 11:00 AM H.J. Lu <hjl.tools@gmail.com> wrote:
> >
> > Before calling elf_get_dynamic_info to get dynamic info in bootstrap_map,
> > initalize bootstrap_map.l_ld_readonly with BOOTSTRAP_MAP_RO_DYN_SECTION.
> >
> > This updates BZ #28340 fix.
> > ---
> >  elf/rtld.c                       | 1 +
> >  sysdeps/generic/dl-relocate-ld.h | 3 +++
> >  sysdeps/mips/dl-relocate-ld.h    | 3 +++
> >  sysdeps/riscv/dl-relocate-ld.h   | 4 ++++
> >  4 files changed, 11 insertions(+)
> >
> > diff --git a/elf/rtld.c b/elf/rtld.c
> > index c66a1d00bc..51a471e6b7 100644
> > --- a/elf/rtld.c
> > +++ b/elf/rtld.c
> > @@ -547,6 +547,7 @@ _dl_start (void *arg)
> >
> >    /* Read our own dynamic section and fill in the info array.  */
> >    bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic ();
> > +  bootstrap_map.l_ld_readonly = BOOTSTRAP_MAP_RO_DYN_SECTION;
> >    elf_get_dynamic_info (&bootstrap_map, true, false);
> >
> >  #if NO_TLS_OFFSET != 0
> > diff --git a/sysdeps/generic/dl-relocate-ld.h b/sysdeps/generic/dl-relocate-ld.h
> > index 5fae206db9..09c7ba0448 100644
> > --- a/sysdeps/generic/dl-relocate-ld.h
> > +++ b/sysdeps/generic/dl-relocate-ld.h
> > @@ -19,6 +19,9 @@
> >  #ifndef _DL_RELOCATE_LD_H
> >  #define _DL_RELOCATE_LD_H
> >
> > +/* The dynamic section in bootstrap_map is writable.  */
> > +#define BOOTSTRAP_MAP_RO_DYN_SECTION 0
> > +
> >  /* Return true if dynamic section in the shared library L should be
> >     relocated.  */
> >
> > diff --git a/sysdeps/mips/dl-relocate-ld.h b/sysdeps/mips/dl-relocate-ld.h
> > index 0c18d9a567..2c4edbe9f4 100644
> > --- a/sysdeps/mips/dl-relocate-ld.h
> > +++ b/sysdeps/mips/dl-relocate-ld.h
> > @@ -19,6 +19,9 @@
> >  #ifndef _DL_RELOCATE_LD_H
> >  #define _DL_RELOCATE_LD_H
> >
> > +/* The dynamic section in bootstrap_map is readonly.  */
> > +#define BOOTSTRAP_MAP_RO_DYN_SECTION 1
> > +
> >  /* Return true if dynamic section in the shared library L should be
> >     relocated.  */
> >
> > diff --git a/sysdeps/riscv/dl-relocate-ld.h b/sysdeps/riscv/dl-relocate-ld.h
> > index 10327454b1..240f85b79e 100644
> > --- a/sysdeps/riscv/dl-relocate-ld.h
> > +++ b/sysdeps/riscv/dl-relocate-ld.h
> > @@ -19,6 +19,10 @@
> >  #ifndef _DL_RELOCATE_LD_H
> >  #define _DL_RELOCATE_LD_H
> >
> > +/* The dynamic section in bootstrap_map is writable.  This is ignored
> > +   on RISC-V.  */
> > +#define BOOTSTRAP_MAP_RO_DYN_SECTION 0
> > +
> >  /* Return true if dynamic section in the shared library L should be
> >     relocated.  */
> >
> > --
> > 2.32.0
> >
>
> This patch is wrong.  Don't use it.
>

The right one is at

https://sourceware.org/pipermail/libc-alpha/2021-October/132063.html
diff mbox series

Patch

diff --git a/elf/rtld.c b/elf/rtld.c
index c66a1d00bc..51a471e6b7 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -547,6 +547,7 @@  _dl_start (void *arg)
 
   /* Read our own dynamic section and fill in the info array.  */
   bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic ();
+  bootstrap_map.l_ld_readonly = BOOTSTRAP_MAP_RO_DYN_SECTION;
   elf_get_dynamic_info (&bootstrap_map, true, false);
 
 #if NO_TLS_OFFSET != 0
diff --git a/sysdeps/generic/dl-relocate-ld.h b/sysdeps/generic/dl-relocate-ld.h
index 5fae206db9..09c7ba0448 100644
--- a/sysdeps/generic/dl-relocate-ld.h
+++ b/sysdeps/generic/dl-relocate-ld.h
@@ -19,6 +19,9 @@ 
 #ifndef _DL_RELOCATE_LD_H
 #define _DL_RELOCATE_LD_H
 
+/* The dynamic section in bootstrap_map is writable.  */
+#define BOOTSTRAP_MAP_RO_DYN_SECTION 0
+
 /* Return true if dynamic section in the shared library L should be
    relocated.  */
 
diff --git a/sysdeps/mips/dl-relocate-ld.h b/sysdeps/mips/dl-relocate-ld.h
index 0c18d9a567..2c4edbe9f4 100644
--- a/sysdeps/mips/dl-relocate-ld.h
+++ b/sysdeps/mips/dl-relocate-ld.h
@@ -19,6 +19,9 @@ 
 #ifndef _DL_RELOCATE_LD_H
 #define _DL_RELOCATE_LD_H
 
+/* The dynamic section in bootstrap_map is readonly.  */
+#define BOOTSTRAP_MAP_RO_DYN_SECTION 1
+
 /* Return true if dynamic section in the shared library L should be
    relocated.  */
 
diff --git a/sysdeps/riscv/dl-relocate-ld.h b/sysdeps/riscv/dl-relocate-ld.h
index 10327454b1..240f85b79e 100644
--- a/sysdeps/riscv/dl-relocate-ld.h
+++ b/sysdeps/riscv/dl-relocate-ld.h
@@ -19,6 +19,10 @@ 
 #ifndef _DL_RELOCATE_LD_H
 #define _DL_RELOCATE_LD_H
 
+/* The dynamic section in bootstrap_map is writable.  This is ignored
+   on RISC-V.  */
+#define BOOTSTRAP_MAP_RO_DYN_SECTION 0
+
 /* Return true if dynamic section in the shared library L should be
    relocated.  */