Skip to content

Fix integer overflow in data loader bounds checks #18676

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
lucylq wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix integer overflow in data loader bounds checks #18676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae4a34f
Fix integer overflow in data loader bounds checks
Mar 5, 2026
6ebf6a3
use c10::add_overflows
Apr 2, 2026
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 extension/data_loader/buffer_data_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class BufferDataLoader final : public executorch::runtime::DataLoader {
ET_CHECK_OR_RETURN_ERROR(
!overflow && total_size <= size_,
InvalidArgument,
"offset %zu + size %zu > size_ %zu",
"offset %zu + size %zu > size_ %zu, or overflow detected",
offset,
size,
size_);
Expand Down
13 changes: 9 additions & 4 deletions extension/data_loader/file_data_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <sys/stat.h>
#include <sys/types.h>

#include <c10/util/safe_numerics.h>
#include <executorch/runtime/core/error.h>
#include <executorch/runtime/core/result.h>
#include <executorch/runtime/platform/log.h>
Expand Down Expand Up @@ -143,10 +144,12 @@ Result<FreeableBuffer> FileDataLoader::load(
fd_ >= 0,
InvalidState,
"Uninitialized");
size_t total_size;
bool overflow = c10::add_overflows(offset, size, &total_size);
ET_CHECK_OR_RETURN_ERROR(
offset + size <= file_size_,
!overflow && total_size <= file_size_,
InvalidArgument,
"File %s: offset %zu + size %zu > file_size_ %zu",
"File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected",
file_name_,
offset,
size,
Expand Down Expand Up @@ -204,10 +207,12 @@ ET_NODISCARD Error FileDataLoader::load_into(
fd_ >= 0,
InvalidState,
"Uninitialized");
size_t total_size;
bool overflow = c10::add_overflows(offset, size, &total_size);
ET_CHECK_OR_RETURN_ERROR(
offset + size <= file_size_,
!overflow && total_size <= file_size_,
InvalidArgument,
"File %s: offset %zu + size %zu > file_size_ %zu",
"File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected",
file_name_,
offset,
size,
Expand Down
13 changes: 9 additions & 4 deletions extension/data_loader/file_descriptor_data_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <sys/types.h>
#include <unistd.h>

#include <c10/util/safe_numerics.h>
#include <executorch/runtime/core/error.h>
#include <executorch/runtime/core/result.h>
#include <executorch/runtime/platform/log.h>
Expand Down Expand Up @@ -157,10 +158,12 @@ Result<FreeableBuffer> FileDescriptorDataLoader::load(
fd_ >= 0,
InvalidState,
"Uninitialized");
size_t total_size;
bool overflow = c10::add_overflows(offset, size, &total_size);
ET_CHECK_OR_RETURN_ERROR(
offset + size <= file_size_,
!overflow && total_size <= file_size_,
InvalidArgument,
"File %s: offset %zu + size %zu > file_size_ %zu",
"File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected",
file_descriptor_uri_,
offset,
size,
Expand Down Expand Up @@ -218,10 +221,12 @@ ET_NODISCARD Error FileDescriptorDataLoader::load_into(
fd_ >= 0,
InvalidState,
"Uninitialized");
size_t total_size;
bool overflow = c10::add_overflows(offset, size, &total_size);
ET_CHECK_OR_RETURN_ERROR(
offset + size <= file_size_,
!overflow && total_size <= file_size_,
InvalidArgument,
"File %s: offset %zu + size %zu > file_size_ %zu",
"File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected",
file_descriptor_uri_,
offset,
size,
Expand Down
7 changes: 5 additions & 2 deletions extension/data_loader/mmap_data_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <sys/stat.h>
#include <sys/types.h>

#include <c10/util/safe_numerics.h>
#include <executorch/extension/data_loader/mman.h>
#include <executorch/runtime/core/error.h>
#include <executorch/runtime/core/result.h>
Expand Down Expand Up @@ -159,10 +160,12 @@ Error MmapDataLoader::validate_input(size_t offset, size_t size) const {
fd_ >= 0,
InvalidState,
"Uninitialized");
size_t total_size;
bool overflow = c10::add_overflows(offset, size, &total_size);
ET_CHECK_OR_RETURN_ERROR(
offset + size <= file_size_,
!overflow && total_size <= file_size_,
InvalidArgument,
"File %s: offset %zu + size %zu > file_size_ %zu",
"File %s: offset %zu + size %zu > file_size_ %zu, or overflow detected",
file_name_,
offset,
size,
Expand Down
7 changes: 5 additions & 2 deletions extension/data_loader/shared_ptr_data_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#pragma once

#include <c10/util/safe_numerics.h>
#include <executorch/runtime/core/data_loader.h>
#include <executorch/runtime/core/error.h>
#include <executorch/runtime/core/result.h>
Expand All @@ -33,10 +34,12 @@ class SharedPtrDataLoader final : public executorch::runtime::DataLoader {
size_t offset,
size_t size,
ET_UNUSED const DataLoader::SegmentInfo& segment_info) const override {
size_t total_size;
bool overflow = c10::add_overflows(offset, size, &total_size);
ET_CHECK_OR_RETURN_ERROR(
offset + size <= size_,
!overflow && total_size <= size_,
InvalidArgument,
"offset %zu + size %zu > size_ %zu",
"offset %zu + size %zu > size_ %zu, or overflow detected",
offset,
size,
size_);
Expand Down
Loading