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

mm/ubsan: fix signed inline value decoding

Browse source 
Restore the explicit signed conversion and parenthesize the sign-bit test
so it is evaluated before the bitwise AND.  Without this, operator
precedence makes the decoder test bit zero instead of the sign bit and
negative inline operands are reported as large positive values.

Build the width mask without shifting by the full width of uint64_t.
This avoids recursively invoking UBSan while decoding a 64-bit inline
operand.

Signed-off-by: hanzhijian <hanzhijian@zepp.com>
This commit is contained in:
hanzhijian 2026-07-29 20:05:53 +08:00 • committed by Alin Jerpelea
parent 83ac26ba1c
commit 6f175b0997
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mm/ubsan/ubsan.c
View file

@ -158,10 +158,11 @@ static int64_t get_signed_val(FAR struct type_descriptor *type,
if (is_inline_int(type))
{
unsigned bits = type_bit_width(type);
uint64_t mask = (1llu << bits) - 1;
uint64_t mask = UINT64_MAX >> (sizeof(uint64_t) * 8 - bits);
uint64_t ret = (uintptr_t)val & mask;
return ret & (1llu << (bits - 1)) != 0 ? ret | ~mask : ret;
return (int64_t)(((ret & (1llu << (bits - 1))) != 0) ?
ret | ~mask : ret);
}
return *(FAR int64_t *)val;