Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

JIT: Ensure no overflow in ContainBlockStoreAddress #76532

Merged
merged 2 commits into from
Oct 3, 2022
Merged

JIT: Ensure no overflow in ContainBlockStoreAddress #76532

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
774f7df
JIT: Ensure no overflow in ContainBlockStoreAddress
jakobbotsch Oct 3, 2022
81b2fa6
Nit
jakobbotsch Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/coreclr/jit/lowerarmarch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,12 @@ void Lowering::ContainBlockStoreAddress(GenTreeBlk* blkNode, unsigned size, GenT
{
return;
}
#endif // TARGET_ARM
#else // !TARGET_ARM
if ((ClrSafeInt<int>(offset) + ClrSafeInt<int>(size)).IsOverflow())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this overflow on arm too? Should this be outside the ifdef?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the ARM specific check above is fine -- we only get here for unrolled block copies so size is guaranteed to be small.

{
return;
}
#endif // !TARGET_ARM

if (!IsSafeToContainMem(blkNode, addr))
{
Expand Down