michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: x86: core: remove order eval of 'z_x86_check_stack_bounds' args

Browse source 
The code depends on the order of evaluation 'z_x86_check_stack_bounds'
function arguments.
The solution is to assign these values to variables and then pass
them in.
The fix would be to make 2 local variables, assign them the values
of _df_esf.esp and .cs, and then call the function with those 2 local
variables as arguments.
Found as a coding guideline violation (MISRA R13.2) by static
coding scanning tool.

Change "int reason" to "unsigned reason" like in other functions.

Signed-off-by: Maksim Masalski <maksim.masalski@intel.com>
This commit is contained in:
Maksim Masalski 2021-05-12 16:17:22 +08:00 • committed by Anas Nashif
commit 466c5d9dea
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
arch/x86/core/ia32/fatal.c
View file

@ -163,7 +163,7 @@ __pinned_func
static __used void df_handler_bottom(void)
{
/* We're back in the main hardware task on the interrupt stack */
int reason = K_ERR_CPU_EXCEPTION;
unsigned int reason = K_ERR_CPU_EXCEPTION;
/* Restore the top half so it is runnable again */
_df_tss.esp = (uint32_t)(_df_stack + sizeof(_df_stack));
@ -171,7 +171,14 @@ static __used void df_handler_bottom(void)
LOG_ERR("Double Fault");
#ifdef CONFIG_THREAD_STACK_INFO
if (z_x86_check_stack_bounds(_df_esf.esp, 0, _df_esf.cs)) {
/* To comply with MISRA 13.2 rule necessary to exclude code that depends
* on the order of evaluation of function arguments.
* Create 2 variables to store volatile data from the structure _df_esf
*/
uint32_t df_esf_esp = _df_esf.esp;
uint16_t df_esf_cs = _df_esf.cs;
if (z_x86_check_stack_bounds(df_esf_esp, 0, df_esf_cs)) {
reason = K_ERR_STACK_CHK_FAIL;
}
#endif