Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-08 16:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

shell: Only clear std handles when the shell task exits

Browse Source 
Clearing the std file handles when the main loop exited crashes
telnetd as it reuses its session threads.

Closes #3859
This commit is contained in:
Chris Johns
2020-08-08 18:07:32 +10:00
parent 534f9dbe13
commit 95036a4591
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cpukit/libmisc/shell/shell.c
View File

@@ -234,12 +234,16 @@ static void rtems_shell_clear_shell_env(void)
eno = pthread_setspecific(rtems_shell_current_env_key, NULL); eno = pthread_setspecific(rtems_shell_current_env_key, NULL);
if (eno != 0) if (eno != 0)
rtems_error(0, "pthread_setspecific(shell_current_env_key): clear"); rtems_error(0, "pthread_setspecific(shell_current_env_key): clear");
}
/* /*
* Clear stdin and stdout file pointers of they will be closed * Clear stdin, stdout and stderr file pointers so they will not be closed.
*/ */
static void rtems_shell_clear_shell_std_handles(void)
{
stdin = NULL; stdin = NULL;
stdout = NULL; stdout = NULL;
stderr = NULL;
} }
/* /*
@@ -775,6 +779,7 @@ void rtems_shell_print_env(
{ {
if ( !shell_env ) { if ( !shell_env ) {
printk( "shell_env is NULL\n" ); printk( "shell_env is NULL\n" );
return; return;
} }
printk( "shell_env=%p\n" printk( "shell_env=%p\n"
@@ -797,6 +802,7 @@ static rtems_task rtems_shell_task(rtems_task_argument task_argument)
rtems_shell_env_t *shell_env = (rtems_shell_env_t*) task_argument; rtems_shell_env_t *shell_env = (rtems_shell_env_t*) task_argument;
rtems_id wake_on_end = shell_env->wake_on_end; rtems_id wake_on_end = shell_env->wake_on_end;
rtems_shell_main_loop( shell_env ); rtems_shell_main_loop( shell_env );
rtems_shell_clear_shell_std_handles();
if (wake_on_end != RTEMS_INVALID_ID) if (wake_on_end != RTEMS_INVALID_ID)
rtems_event_send (wake_on_end, RTEMS_EVENT_1); rtems_event_send (wake_on_end, RTEMS_EVENT_1);
rtems_task_exit(); rtems_task_exit();
@@ -872,6 +878,11 @@ bool rtems_shell_main_loop(
else else
stdout = stderr; stdout = stderr;
} else if (strcmp(shell_env->output, "/dev/null") == 0) { } else if (strcmp(shell_env->output, "/dev/null") == 0) {
if (stdout == NULL) {
fprintf(stderr, "shell: stdout is NULLs\n");
rtems_shell_clear_shell_env();
return false;
}
fclose (stdout); fclose (stdout);
} else { } else {
FILE *output = fopen(shell_env->output, FILE *output = fopen(shell_env->output,
@@ -906,6 +917,13 @@ bool rtems_shell_main_loop(
} }
if (!input_file) { if (!input_file) {
if (stdin == NULL) {
fprintf(stderr, "shell: stdin is NULLs\n");
if (stdoutToClose != NULL)
fclose(stdoutToClose);
rtems_shell_clear_shell_env();
return false;
}
/* Make a raw terminal, Linux Manuals */ /* Make a raw terminal, Linux Manuals */
if (tcgetattr(fileno(stdin), &previous_term) >= 0) { if (tcgetattr(fileno(stdin), &previous_term) >= 0) {
term = previous_term; term = previous_term;
@@ -967,7 +985,7 @@ bool rtems_shell_main_loop(
* keep on trucking. * keep on trucking.
*/ */
if (shell_env->login_check != NULL) { if (shell_env->login_check != NULL) {
result = rtems_shell_login(shell_env, stdin,stdout); result = rtems_shell_login(shell_env, stdin, stdout);
} else { } else {
setuid(shell_env->uid); setuid(shell_env->uid);
setgid(shell_env->gid); setgid(shell_env->gid);