Skip to content

fix lwp _load_script. #7405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Guozhanxin merged 2 commits into from
Apr 28, 2023
Merged

fix lwp _load_script. #7405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3812a7b
fix lwp _load_script.
geniusgogo Apr 27, 2023
e11341a
fix warning
geniusgogo Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions components/lwp/lwp_syscall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1926,10 +1926,9 @@ static char *_insert_args(int new_argc, char *new_argv[], struct lwp_args_info *
}

#define INTERP_BUF_SIZE 128
static char *_load_script(const char *filename, struct lwp_args_info *args)
static char *_load_script(const char *filename, void *old_page, struct lwp_args_info *args)
{
void *page = NULL;
char *new_page;
char *new_page = NULL;
int fd = -RT_ERROR;
int len;
char interp[INTERP_BUF_SIZE];
Expand All @@ -1947,7 +1946,10 @@ static char *_load_script(const char *filename, struct lwp_args_info *args)
{
goto quit;
}

/*
* match find file header the first line.
* eg: #!/bin/sh
*/
if ((interp[0] != '#') || (interp[1] != '!'))
{
goto quit;
Expand Down Expand Up @@ -2002,23 +2004,26 @@ static char *_load_script(const char *filename, struct lwp_args_info *args)
if (i_arg)
{
new_page = _insert_args(1, &i_arg, args);
rt_pages_free(page, 0);
page = new_page;
if (!page)
if (!new_page)
{
goto quit;
}
rt_pages_free(old_page, 0);
old_page = new_page;
}
new_page = _insert_args(1, &i_name, args);
rt_pages_free(page, 0);
page = new_page;
if (!new_page)
{
goto quit;
}
rt_pages_free(old_page, 0);

quit:
if (fd >= 0)
{
close(fd);
}
return page;
return new_page;
}

int load_ldso(struct rt_lwp *lwp, char *exec_name, char *const argv[], char *const envp[])
Expand Down Expand Up @@ -2107,33 +2112,33 @@ int load_ldso(struct rt_lwp *lwp, char *exec_name, char *const argv[], char *con
args_info.size = size;

new_page = _insert_args(1, &exec_name, &args_info);
rt_pages_free(page, 0);
page = new_page;
if (!page)
if (!new_page)
{
SET_ERRNO(ENOMEM);
goto quit;
}
rt_pages_free(page, 0);
page = new_page;

i_arg = "-e";
new_page = _insert_args(1, &i_arg, &args_info);
rt_pages_free(page, 0);
page = new_page;
if (!page)
if (!new_page)
{
SET_ERRNO(ENOMEM);
goto quit;
}
rt_pages_free(page, 0);
page = new_page;

i_arg = "ld.so";
new_page = _insert_args(1, &i_arg, &args_info);
rt_pages_free(page, 0);
page = new_page;
if (!page)
if (!new_page)
{
SET_ERRNO(ENOMEM);
goto quit;
}
rt_pages_free(page, 0);
page = new_page;

if ((aux = lwp_argscopy(lwp, args_info.argc, args_info.argv, args_info.envp)) == NULL)
{
Expand Down Expand Up @@ -2312,12 +2317,12 @@ sysret_t sys_execve(const char *path, char *const argv[], char *const envp[])
args_info.size = size;
while (1)
{
new_page = _load_script(path, &args_info);
new_page = _load_script(path, page, &args_info);
if (!new_page)
{
break;
}
rt_pages_free(page, 0);

page = new_page;
path = args_info.argv[0];
}
Expand Down