Skip to content

Fix various OOB access across TensorFlow. #3565

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix various OOB access across TensorFlow. #3565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 21 additions & 0 deletions tsl/platform/ctstring_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,13 @@ static inline const char *TF_TString_GetDataPointer(const TF_TString *str) {

static inline char *TF_TString_ResizeUninitialized(TF_TString *str,
size_t new_size) {
if (new_size >= (size_t)~0 - 16) {
#if defined(__clang__) || defined(__GNUC__)
__builtin_trap();
#else
*(volatile int*)0 = 0;
#endif
}
size_t curr_size = TF_TString_GetSize(str);
size_t copy_size = TF_min(new_size, curr_size);

Expand Down Expand Up @@ -279,6 +286,13 @@ static inline char *TF_TString_ResizeUninitialized(TF_TString *str,
new_cap = TF_align16(curr_cap / 2 + 1) - 1;
} else if (new_size > curr_cap) {
new_cap = TF_align16(new_size + 1) - 1;
if (new_cap < new_size) { // Check for overflow after alignment
#if defined(__clang__) || defined(__GNUC__)
__builtin_trap();
#else
*(volatile int*)0 = 0;
#endif
}
} else {
new_cap = curr_cap;
}
Expand Down Expand Up @@ -325,6 +339,13 @@ static inline char *TF_TString_GetMutableDataPointer(TF_TString *str) {
}

static inline void TF_TString_Reserve(TF_TString *str, size_t new_cap) {
if (new_cap > (size_t)~0 - 16) {
#if defined(__clang__) || defined(__GNUC__)
__builtin_trap();
#else
*(volatile int*)0 = 0;
#endif
}
TF_TString_Type curr_type = TF_TString_GetType(str);

if (new_cap <= TF_TString_SmallCapacity) {
Expand Down
Loading