disable nbytes and numel check

Differential Revision: D95636325

Pull Request resolved: pytorch#17987

Author: JacobSzwejbka

runtime/executor/program_validation.cpp

@@ -14,7 +14,7 @@
 #include <executorch/runtime/platform/log.h>
 #include <executorch/schema/program_generated.h>
 
-#include <c10/util/safe_numerics.h>
+// #include <c10/util/safe_numerics.h>
 
 namespace executorch {
 namespace runtime {
@@ -30,7 +30,7 @@ validate_tensor(const executorch_flatbuffer::Tensor* tensor) {
     return Error::InvalidProgram;
   }
 
-  ssize_t numel = 1;
+  // ssize_t numel = 1;
   for (flatbuffers::uoffset_t i = 0; i < sizes->size(); i++) {
     int32_t size = sizes->Get(i);
 
@@ -43,37 +43,38 @@ validate_tensor(const executorch_flatbuffer::Tensor* tensor) {
       return Error::InvalidProgram;
     }
 
-    bool overflow =
-        c10::mul_overflows(numel, static_cast<ssize_t>(size), &numel);
-    if (overflow) {
-      ET_LOG(
-          Error,
-          "numel overflowed at dimension %u with size %d",
-          static_cast<unsigned>(i),
-          size);
-      return Error::InvalidProgram;
-    }
+    // bool overflow =
+    //     c10::mul_overflows(numel, static_cast<ssize_t>(size), &numel);
+    // if (overflow) {
+    //   ET_LOG(
+    //       Error,
+    //       "numel overflowed at dimension %u with size %d",
+    //       static_cast<unsigned>(i),
+    //       size);
+    //   return Error::InvalidProgram;
+    // }
   }
 
   auto scalar_type =
       static_cast<executorch::aten::ScalarType>(tensor->scalar_type());
   if (!executorch::runtime::isValid(scalar_type)) {
+    ET_LOG(Error, "Invalid ScalarType %d", static_cast<int>(scalar_type));
     return Error::InvalidProgram;
   }
 
-  size_t nbytes;
-  bool nbytes_overflow = c10::mul_overflows(
-      static_cast<size_t>(numel),
-      executorch::runtime::elementSize(scalar_type),
-      &nbytes);
-  if (nbytes_overflow) {
-    ET_LOG(
-        Error,
-        "nbytes overflowed: numel %zd with element size %zu",
-        numel,
-        executorch::runtime::elementSize(scalar_type));
-    return Error::InvalidProgram;
-  }
+  // size_t nbytes;
+  // bool nbytes_overflow = c10::mul_overflows(
+  //     static_cast<size_t>(numel),
+  //     executorch::runtime::elementSize(scalar_type),
+  //     &nbytes);
+  // if (nbytes_overflow) {
+  //   ET_LOG(
+  //       Error,
+  //       "nbytes overflowed: numel %zd with element size %zu",
+  //       numel,
+  //       executorch::runtime::elementSize(scalar_type));
+  //   return Error::InvalidProgram;
+  // }
 
   return Error::Ok;
 }

runtime/executor/test/program_validation_test.cpp

@@ -206,29 +206,29 @@ TEST_F(ProgramValidationTest, InternalConsistencyDetectsTruncatedData) {
   ASSERT_EQ(program.error(), Error::InvalidProgram);
 }
 
-TEST_F(ProgramValidationTest, TensorNumelOverflowDetected) {
-  std::vector<EValueConfig> configs = {
-      {EValueType::Tensor, {2000000000, 2000000000, 2000000000}, {}}};
-
-  AlignedBuffer buf(CreateTestProgram(configs));
-  auto loader = buf.loader();
-
-  Result<Program> program =
-      Program::load(&loader, Program::Verification::InternalConsistency);
-  EXPECT_EQ(program.error(), Error::InvalidProgram);
-}
-
-TEST_F(ProgramValidationTest, TensorNumelOverflowNotDetectedWithMinimal) {
-  std::vector<EValueConfig> configs = {
-      {EValueType::Tensor, {2000000000, 2000000000, 2000000000}, {}}};
-
-  AlignedBuffer buf(CreateTestProgram(configs));
-  auto loader = buf.loader();
-
-  // Minimal verification doesn't run program validation.
-  Result<Program> program =
-      Program::load(&loader, Program::Verification::Minimal);
-}
+// TEST_F(ProgramValidationTest, TensorNumelOverflowDetected) {
+//   std::vector<EValueConfig> configs = {
+//       {EValueType::Tensor, {2000000000, 2000000000, 2000000000}, {}}};
+//
+//   AlignedBuffer buf(CreateTestProgram(configs));
+//   auto loader = buf.loader();
+//
+//   Result<Program> program =
+//       Program::load(&loader, Program::Verification::InternalConsistency);
+//   EXPECT_EQ(program.error(), Error::InvalidProgram);
+// }
+
+// TEST_F(ProgramValidationTest, TensorNumelOverflowNotDetectedWithMinimal) {
+//   std::vector<EValueConfig> configs = {
+//       {EValueType::Tensor, {2000000000, 2000000000, 2000000000}, {}}};
+//
+//   AlignedBuffer buf(CreateTestProgram(configs));
+//   auto loader = buf.loader();
+//
+//   // Minimal verification doesn't run program validation.
+//   Result<Program> program =
+//       Program::load(&loader, Program::Verification::Minimal);
+// }
 
 TEST_F(ProgramValidationTest, NegativeSizeDetected) {
   std::vector<EValueConfig> configs = {{EValueType::Tensor, {10, -5, 10}, {}}};