Skip to content

[scudo] Fix stack depot validation. #87024

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 29, 2024
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion compiler-rt/lib/scudo/standalone/stack_depot.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class alignas(atomic_u64) StackDepot {
if (TabMask == 0)
return false;
uptr TabSize = TabMask + 1;
if (!isPowerOfTwo(TabSize))
if (TabSize == 0 || !isPowerOfTwo(TabSize))
return false;
Comment on lines +115 to 116
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm wondering if we should fix isPowerOfTwo instead? Zero is not a power of 2.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It might be worth doing that, but I do worry that somewhere, something depends on the behavior.

I'll file a bug because I think that's a bigger change and requires some extra verification.

Copy link
Contributor

Choose a reason for hiding this comment

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

I did a quick review and it seems to be fine (there's no additional zero check will be introduced). And yes, it's fine to track it later

uptr TabBytes = sizeof(atomic_u32) * TabSize;

Expand Down