Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-01 20:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

arch: Add stack alignment and stack size checking when CONFIG_TLS_ALIGNED=y

Browse source 
Add validation to ensure allocated stack size does not exceed TLS_MAXSTACK when
CONFIG_TLS_ALIGNED is enabled, and verify proper stack alignment using STACK_ALIGN_MASK
across all architectures. This improves stack safety and prevents potential TLS overflow conditions.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5 2025-06-23 17:06:05 +08:00 • committed by Xiang Xiao
parent 3522ee372d
commit a3273e6a96
20 changed files with 245 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/src/common/arm_usestack.c
View file

@ -77,10 +77,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/arm64/src/common/arm64_usestack.c
View file

@ -88,10 +88,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/avr/src/avr/avr_usestack.c
View file

@ -74,10 +74,20 @@
int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
{
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/avr/src/avr32/avr_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

18
arch/ceva/src/common/ceva_usestack.c
View file

@ -71,13 +71,21 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
uintptr_t top_of_stack;
size_t size_of_stack;
#ifdef CONFIG_TLS
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT((uintptr_t)stack & (TLS_STACK_ALIGN - 1) == 0);
#else
DEBUGASSERT((uintptr_t)stack & STACK_ALIGN_MASK == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/hc/src/common/hc_usestack.c
View file

@ -75,10 +75,20 @@ int up_use_stack(FAR struct tcb_s *tcb, FAR void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/mips/src/common/mips_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/misoc/src/lm32/lm32_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/misoc/src/minerva/minerva_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/or1k/src/common/or1k_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/renesas/src/common/renesas_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/risc-v/src/common/riscv_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/sim/src/sim/sim_usestack.c
View file

@ -75,10 +75,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

16
arch/sparc/src/common/sparc_usestack.c
View file

@ -73,6 +73,22 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t top_of_stack;
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */
if (tcb->stack_alloc_ptr)

14
arch/tricore/src/common/tricore_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/x86/src/i486/i486_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/x86_64/src/intel64/intel64_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/xtensa/src/common/xtensa_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/z16/src/common/z16_usestack.c
View file

@ -76,10 +76,20 @@ int up_use_stack(FAR struct tcb_s *tcb, FAR void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */

14
arch/z80/src/common/z80_usestack.c
View file

@ -75,10 +75,20 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
size_t size_of_stack;
#ifdef CONFIG_TLS_ALIGNED
/* The allocated stack size must not exceed the maximum possible for the
* TLS feature.
*/
DEBUGASSERT(stack_size <= TLS_MAXSTACK);
if (stack_size >= TLS_MAXSTACK)
{
stack_size = TLS_MAXSTACK;
}
#endif
/* Make certain that the user provided stack is properly aligned */
DEBUGASSERT(((uintptr_t)stack & TLS_STACK_MASK) == 0);
#endif
DEBUGASSERT(((uintptr_t)stack & STACK_ALIGN_MASK) == 0);
/* Is there already a stack allocated? */