len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2026-10-10 08:02:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix(armv8m): Reject undersized secure stack in AllocateContext (#1474)

Browse source 
Gate against undersized stack values which do not account for fixed values.

Thanks @aggarg for the help developing this!
This commit is contained in:
Kody Stribrny 2026-08-21 09:38:33 -07:00 • committed by GitHub
parent 5f109e6f55
commit ce36e04208
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 75 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
portable/ARMv8M/secure/context/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/GCC/ARM_CM23/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/GCC/ARM_CM33/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/GCC/ARM_CM35P/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/GCC/ARM_CM52/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/GCC/ARM_CM55/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/GCC/ARM_CM85/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/GCC/ARM_STAR_MC3/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/IAR/ARM_CM23/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/IAR/ARM_CM33/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/IAR/ARM_CM35P/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/IAR/ARM_CM52/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/IAR/ARM_CM55/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/IAR/ARM_CM85/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else

6
portable/IAR/ARM_STAR_MC3/secure/secure_context.c
View file

@ -214,8 +214,12 @@ secureportNON_SECURE_CALLABLE void SecureContext_Init( void )
if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS ) if( ulSecureContextIndex < secureconfigMAX_SECURE_CONTEXTS )
{ {
/* Allocate the stack space if possible. */ /* Allocate the stack space if possible. */
if( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) if( ( ulSecureStackSize < securecontextSTACK_SEAL_SIZE ) ||
( ulSecureStackSize > ( UINT32_MAX - securecontextSTACK_SEAL_SIZE ) ) )
{ {
/* Reject stacks that are too small (the CONTROL word would be
* written before the allocation, corrupting the secure heap)
* and sizes that would overflow when the seal size is added. */
pucStackMemory = NULL; pucStackMemory = NULL;
} }
else else