Skip to content

Add bounds check in AddSingleValueAndAdvance to prevent OOB read from empty repeated fields #4147

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
shaggyinsomniac wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add bounds check in AddSingleValueAndAdvance to prevent OOB read from empty repeated fields #4147

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
28 changes: 28 additions & 0 deletions tensorflow_serving/util/json_tensor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,34 @@ bool IsNamedTensorBytes(const string& name, const TensorProto& tensor) {
Status AddSingleValueAndAdvance(const TensorProto& tensor, bool string_as_bytes,
RapidJsonWriter* writer, int* offset) {
bool success = false;
// Check that the offset is within the bounds of the repeated field for
// this dtype. When --enable_serialization_as_tensor_content is used, the
// tensor data is stored in tensor_content and the typed repeated fields
// (float_val, int_val, etc.) remain empty, making this indexing OOB in
// release builds (RepeatedField::Get uses DCHECK, compiled out).
const int repeated_field_size = [&tensor]() -> int {
switch (tensor.dtype()) {
case DT_FLOAT: return tensor.float_val_size();
case DT_DOUBLE: return tensor.double_val_size();
case DT_INT32:
case DT_INT16:
case DT_INT8:
case DT_UINT8: return tensor.int_val_size();
case DT_INT64: return tensor.int64_val_size();
case DT_BOOL: return tensor.bool_val_size();
case DT_UINT32: return tensor.uint32_val_size();
case DT_UINT64: return tensor.uint64_val_size();
case DT_STRING: return tensor.string_val_size();
default: return 0;
}
}();
if (*offset >= repeated_field_size) {
return errors::InvalidArgument(
"Tensor value index ", *offset,
" is out of bounds for dtype ", DataTypeString(tensor.dtype()),
" (repeated field size: ", repeated_field_size,
"). This can occur when tensor_content serialization is enabled");
}
switch (tensor.dtype()) {
case DT_FLOAT:
success = WriteDecimal(writer, tensor.float_val(*offset));
Expand Down