nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-23 04:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix faulty IRAM check in check_32bit_address_range_in_program

Browse source
This commit is contained in:
TuxSH 2018-05-08 00:08:17 +02:00
parent 880f49cfa5
commit d390ead56f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fusee/fusee-primary/src/utils.h
View file

@ -80,7 +80,7 @@ static inline bool check_32bit_address_range_loadable(uintptr_t addr, size_t siz
return return
!__builtin_add_overflow_p(addr, size, (uintptr_t)0) && /* the range doesn't overflow */ !__builtin_add_overflow_p(addr, size, (uintptr_t)0) && /* the range doesn't overflow */
check_32bit_address_loadable(addr) && check_32bit_address_loadable(addr + size) && /* bounds are valid */ check_32bit_address_loadable(addr) && check_32bit_address_loadable(addr + size) && /* bounds are valid */
!(addr >= 0x40010000u && addr + size >= 0x40040000u) /* the range doesn't cross MMIO */ !(addr >= 0x40010000u && addr < 0x40040000u && addr + size >= 0x40040000u) /* the range doesn't cross MMIO */
; ;
} }

2
fusee/fusee-secondary/src/utils.h
View file

@ -80,7 +80,7 @@ static inline bool check_32bit_address_range_loadable(uintptr_t addr, size_t siz
return return
!__builtin_add_overflow_p(addr, size, (uintptr_t)0) && /* the range doesn't overflow */ !__builtin_add_overflow_p(addr, size, (uintptr_t)0) && /* the range doesn't overflow */
check_32bit_address_loadable(addr) && check_32bit_address_loadable(addr + size) && /* bounds are valid */ check_32bit_address_loadable(addr) && check_32bit_address_loadable(addr + size) && /* bounds are valid */
!(addr >= 0x40010000u && addr + size >= 0x40040000u) /* the range doesn't cross MMIO */ !(addr >= 0x40010000u && addr < 0x40040000u && addr + size >= 0x40040000u) /* the range doesn't cross MMIO */
; ;
} }