michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: fix race condition in shell instance initialization

Browse source 
So far shell transport was initialized early before any k_poll events
and signals. transport_evt_handler() was passed as callback to transport
initializer and could be executed right away. This was true for example
with shell_uart when it enabled interrupts on RX and there were already
some bytes to read. As a result executed transport_evt_handler() is
operating on uninitialized k_poll signals.

Address this race condition by simply initializing shell transport when
everything is ready for processing data, i.e. on the end of shell
instance initialization.

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
This commit is contained in:
Marcin Niestroj 2020-01-22 19:27:01 +01:00 • committed by Anas Nashif
commit c2543ddbfa
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
subsys/shell/shell.c
View file

@ -1071,13 +1071,6 @@ static int instance_init(const struct shell *shell, const void *p_config,
__ASSERT_NO_MSG((shell->shell_flag == SHELL_FLAG_CRLF_DEFAULT) || __ASSERT_NO_MSG((shell->shell_flag == SHELL_FLAG_CRLF_DEFAULT) ||
(shell->shell_flag == SHELL_FLAG_OLF_CRLF)); (shell->shell_flag == SHELL_FLAG_OLF_CRLF));
int err = shell->iface->api->init(shell->iface, p_config,
transport_evt_handler,
(void *) shell);
if (err != 0) {
return err;
}
memset(shell->ctx, 0, sizeof(*shell->ctx)); memset(shell->ctx, 0, sizeof(*shell->ctx));
shell->ctx->prompt = shell->default_prompt; shell->ctx->prompt = shell->default_prompt;
@ -1107,7 +1100,9 @@ static int instance_init(const struct shell *shell, const void *p_config,
shell->ctx->vt100_ctx.cons.name_len = shell_strlen(shell->ctx->prompt); shell->ctx->vt100_ctx.cons.name_len = shell_strlen(shell->ctx->prompt);
flag_use_colors_set(shell, IS_ENABLED(CONFIG_SHELL_VT100_COLORS)); flag_use_colors_set(shell, IS_ENABLED(CONFIG_SHELL_VT100_COLORS));
return 0; return shell->iface->api->init(shell->iface, p_config,
transport_evt_handler,
(void *) shell);
} }
static int instance_uninit(const struct shell *shell) static int instance_uninit(const struct shell *shell)