diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-09-17 06:08:15 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-09-17 06:08:15 +0000 |
| commit | 419f843fffd06af29c104330063fb6c22546ea28 (patch) | |
| tree | 3aece6344f1988fe8a2cfdd279caf8102009dbea /libexec | |
| parent | 2c3f47a727372086b41ef9ce06eb1f1eb83a67d3 (diff) | |
| parent | 9d45af5c096ee593c87aede9a3685354795bcf9f (diff) | |
Notes
Diffstat (limited to 'libexec')
| -rwxr-xr-x | libexec/rc/rc.d/growfs | 2 | ||||
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libexec/rc/rc.d/growfs b/libexec/rc/rc.d/growfs index 039813c8f3ee0..54bab2a60dfb6 100755 --- a/libexec/rc/rc.d/growfs +++ b/libexec/rc/rc.d/growfs @@ -31,7 +31,7 @@ # BEFORE: sysctl # KEYWORD: firstboot -# This allows us to distribute a image +# This allows us to distribute an image # and have it work on essentially any size drive. # # TODO: Figure out where this should really be ordered. diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index a42192dce8db6..46bf1efddbd1b 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -499,6 +499,13 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) if (auxp->a_type == AT_NULL) break; } + /* Since the auxiliary vector has moved, redigest it. */ + for (i = 0; i < AT_COUNT; i++) + aux_info[i] = NULL; + for (auxp = aux; auxp->a_type != AT_NULL; auxp++) { + if (auxp->a_type < AT_COUNT) + aux_info[auxp->a_type] = auxp; + } } else { _rtld_error("No binary"); rtld_die(); |