Merge branch 'master' into zephyr-support

2025-01-25 23:48:05 +07:00
parent 8c7998b0e9 37e6f49619
commit 7641060252
3 changed files with 18 additions and 3 deletions
--- a/examples/device/cdc_msc/src/msc_disk.c
+++ b/examples/device/cdc_msc/src/msc_disk.c
@@ -190,7 +190,14 @@ int32_t tud_msc_read10_cb(uint8_t lun, uint32_t lba, uint32_t offset, void* buff
  (void) lun;

  // out of ramdisk
-  if ( lba >= DISK_BLOCK_NUM ) return -1;
+  if ( lba >= DISK_BLOCK_NUM ) {
+    return -1;
+  }
+
+  // Check for overflow of offset + bufsize
+  if ( offset + bufsize > DISK_BLOCK_SIZE ) {
+    return -1;
+  }

  uint8_t const* addr = msc_disk[lba] + offset;
  memcpy(buffer, addr, bufsize);