Removing CSU patches
* Removed startup code patches in lib/csu regarding kernel to userland
ABI.
* Aligned stack layout on NetBSD stack layout.
* Generate valid stack pointers instead of offsets by taking into account
_minix_kerninfo->kinfo->user_sp.
* Refactored stack generation, by moving part of execve in two
functions {minix_stack_params(), minix_stack_fill()} and using them
in execve(), rs and vm.
* Changed load offset of rtld (ld.so) to:
execi.args.stack_high - execi.args.stack_size - 0xa00000
which is 10MB below the main executable stack.
Change-Id: I839daf3de43321cded44105634102d419cb36cec
This commit is contained in:
177
lib/libc/sys-minix/stack_utils.c
Normal file
177
lib/libc/sys-minix/stack_utils.c
Normal file
@@ -0,0 +1,177 @@
|
||||
/* Utilities to generate a proper C stack.
|
||||
*
|
||||
* Author: Lionel A. Sambuc.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include "namespace.h"
|
||||
#include <lib.h>
|
||||
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
#include <minix/param.h>
|
||||
#include <sys/exec_elf.h>
|
||||
#include <sys/exec.h>
|
||||
|
||||
#ifdef __weak_alias
|
||||
__weak_alias(execve, _execve)
|
||||
#endif
|
||||
|
||||
extern struct minix_kerninfo *_minix_kerninfo;
|
||||
|
||||
/* Create a stack image that only needs to be patched up slightly by
|
||||
* the kernel to be used for the process to be executed.
|
||||
*
|
||||
* Every pointers are stored here as offset from the frame base, and
|
||||
* will be adapted as required for the new process address space.
|
||||
*
|
||||
* The following parameters are passed by register to either __start
|
||||
* for static binaries, or _rtld_start for dynamic ones:
|
||||
* *fct, *ObjEntry, *ps_string
|
||||
*
|
||||
* The following stack layout is expected by _rtld():
|
||||
*
|
||||
* | XXXXXXXXXX | 0x0000_00000
|
||||
* | ... |
|
||||
* | ... | Top of the stack
|
||||
* | argc |
|
||||
* | *argv1 | points to the first char of the argv1
|
||||
* | ... |
|
||||
* | *argvN |
|
||||
* | NULL |
|
||||
* | *env1 |
|
||||
* | ... |
|
||||
* | *envN |
|
||||
* | NULL |
|
||||
* | ElfAuxV1 |
|
||||
* | ... |
|
||||
* | ElfAuxVX |
|
||||
* | AuxExecName| fully resolve executable name, as an ASCIIZ string,
|
||||
* at most PMEF_EXECNAMELEN1 long.
|
||||
*
|
||||
* Here we put first the strings, then word-align, then ps_strings, to
|
||||
* comply with the expected layout of NetBSD. This seems to matter for
|
||||
* the NetBSD ps command, so let's make sure we are compatible...
|
||||
*
|
||||
* | strings | Maybe followed by some padding to word-align.
|
||||
* | **argv | \
|
||||
* | argc | +---> ps_string structure content.
|
||||
* | **env | |
|
||||
* | envc | /
|
||||
* | sigcode | On NetBSD, there may be a compatibility stub here,
|
||||
* +------------+ for native code, it is not present.
|
||||
* Stack Base , 0xF000_0000, descending stack.
|
||||
*/
|
||||
|
||||
/* The minimum size of the frame is composed of:
|
||||
* argc, the NULL terminator for argv as well as one for
|
||||
* environ, the ELF Aux vectors, executable name and the
|
||||
* ps_strings struct. */
|
||||
#define STACK_MIN_SZ \
|
||||
( \
|
||||
sizeof(int) + sizeof(void *) * 2 + \
|
||||
sizeof(AuxInfo) * PMEF_AUXVECTORS + PMEF_EXECNAMELEN1 + \
|
||||
sizeof(struct ps_strings) \
|
||||
)
|
||||
|
||||
/*****************************************************************************
|
||||
* Computes stack size, argc, envc, for a given set of path, argv, envp. *
|
||||
*****************************************************************************/
|
||||
void minix_stack_params(const char *path, char * const *argv, char * const *envp,
|
||||
size_t *stack_size, char *overflow, int *argc, int *envc)
|
||||
{
|
||||
char * const *p;
|
||||
size_t const min_size = STACK_MIN_SZ;
|
||||
|
||||
*stack_size = min_size; /* Size of the new initial stack. */
|
||||
*overflow = 0; /* No overflow yet. */
|
||||
*argc = 0; /* Argument count. */
|
||||
*envc = 0; /* Environment count */
|
||||
|
||||
/* Compute and add the size required to store argv and env. */
|
||||
for (p = argv; *p != NULL; p++) {
|
||||
size_t const n = sizeof(*p) + strlen(*p) + 1;
|
||||
*stack_size += n;
|
||||
if (*stack_size < n) {
|
||||
*overflow = 1;
|
||||
}
|
||||
(*argc)++;
|
||||
}
|
||||
|
||||
for (p = envp; *p != NULL; p++) {
|
||||
size_t const n = sizeof(*p) + strlen(*p) + 1;
|
||||
*stack_size += n;
|
||||
if (*stack_size < n) {
|
||||
*overflow = 1;
|
||||
}
|
||||
(*envc)++;
|
||||
}
|
||||
|
||||
/* Compute the aligned frame size. */
|
||||
*stack_size = (*stack_size + sizeof(void *) - 1) &
|
||||
~(sizeof(void *) - 1);
|
||||
|
||||
if (*stack_size < min_size) {
|
||||
/* This is possible only in case of overflow. */
|
||||
*overflow = 1;
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* Generate a stack in the buffer frame, ready to be used. *
|
||||
*****************************************************************************/
|
||||
void minix_stack_fill(const char *path, int argc, char * const *argv,
|
||||
int envc, char * const *envp, size_t stack_size, char *frame,
|
||||
int *vsp, struct ps_strings **psp)
|
||||
{
|
||||
char * const *p;
|
||||
|
||||
/* Frame pointers (a.k.a stack pointer within the buffer in current
|
||||
* address space.) */
|
||||
char *fp; /* byte aligned */
|
||||
char **fpw; /* word aligned */
|
||||
|
||||
size_t const min_size = STACK_MIN_SZ;
|
||||
|
||||
/* Virtual address of the stack pointer, in new memory space. */
|
||||
*vsp = _minix_kerninfo->kinfo->user_sp - stack_size;
|
||||
|
||||
/* Fill in the frame now. */
|
||||
fpw = (char **) frame;
|
||||
*fpw++ = (char *) argc;
|
||||
|
||||
/* The strings themselves are stored after the aux vectors,
|
||||
* cf. top comment. */
|
||||
fp = frame + (min_size - sizeof(struct ps_strings)) +
|
||||
(envc + argc) * sizeof(char *);
|
||||
|
||||
/* Fill in argv and the environment, as well as copy the strings
|
||||
* themselves. */
|
||||
for (p = argv; *p != NULL; p++) {
|
||||
size_t const n = strlen(*p) + 1;
|
||||
*fpw++= (char *)(*vsp + (fp - frame));
|
||||
memcpy(fp, *p, n);
|
||||
fp += n;
|
||||
}
|
||||
*fpw++ = NULL;
|
||||
|
||||
for (p = envp; *p != NULL; p++) {
|
||||
size_t const n = strlen(*p) + 1;
|
||||
*fpw++= (char *)(*vsp + (fp - frame));
|
||||
memcpy(fp, *p, n);
|
||||
fp += n;
|
||||
}
|
||||
*fpw++ = NULL;
|
||||
|
||||
/* Padding, because of the stack alignement. */
|
||||
while ((size_t)fp % sizeof(void *)) *fp++= 0;
|
||||
|
||||
/* Fill in the ps_string struct*/
|
||||
*psp = (struct ps_strings *) fp;
|
||||
|
||||
(*psp)->ps_argvstr = (char **)(*vsp + sizeof(argc));
|
||||
(*psp)->ps_nargvstr = argc;
|
||||
(*psp)->ps_envstr = (*psp)->ps_argvstr + argc + 1;
|
||||
(*psp)->ps_nenvstr = envc;
|
||||
}
|
||||
Reference in New Issue
Block a user