Skip to content

[compiler-rt][ubsan][nfc-ish] Fix a type conversion bug #100665

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.

Sign up for GitHub

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 4 commits into from
Jul 26, 2024
Merged

[compiler-rt][ubsan][nfc-ish] Fix a type conversion bug #100665

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2adefc
[compiler-rt][ubsan][nfc-ish] Fix a type conversion bug
alanzhao1 Jul 25, 2024
1deff79
make `ptrauth_strip` return the same type as value
alanzhao1 Jul 25, 2024
1e01ba0
fix ptrauth_strip fix
alanzhao1 Jul 25, 2024
a4c7bd3
remove cast
alanzhao1 Jul 25, 2024
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/sanitizer_common/sanitizer_ptrauth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
: "=r"(ret) \
: "r"(__value) \
: "x30"); \
ret; \
__typeof(__value) ret; \
})
# define ptrauth_auth_data(__value, __old_key, __old_data) __value
# define ptrauth_string_discriminator(__string) ((int)0)
Expand Down
3 changes: 2 additions & 1 deletion compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ struct VtablePrefix {
std::type_info *TypeInfo;
};
VtablePrefix *getVtablePrefix(void *Vtable) {
Vtable = ptrauth_strip(Vtable, ptrauth_key_cxx_vtable_pointer);
Vtable = reinterpret_cast<void *>(
ptrauth_strip(Vtable, ptrauth_key_cxx_vtable_pointer));
VtablePrefix *Vptr = reinterpret_cast<VtablePrefix*>(Vtable);
VtablePrefix *Prefix = Vptr - 1;
if (!IsAccessibleMemoryRange((uptr)Prefix, sizeof(VtablePrefix)))
Expand Down