Skip to content

fix(cam_hal): prevent SOI scan from (1) running on length<3 and (2) over-reading the last 2 bytes #760

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

fix(cam_hal): prevent SOI scan from (1) running on length<3 and (2) over-reading the last 2 bytes #760

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
18 changes: 13 additions & 5 deletions driver/cam_hal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,21 @@
static const char *TAG = "cam_hal";
static cam_obj_t *cam_obj = NULL;

static const uint32_t JPEG_SOI_MARKER = 0xFFD8FF; // written in little-endian for esp32
static const uint16_t JPEG_EOI_MARKER = 0xD9FF; // written in little-endian for esp32
/* JPEG markers in little-endian order (ESP32). */
static const uint8_t JPEG_SOI_MARKER[] = {0xFF, 0xD8, 0xFF}; /* SOI = FF D8 FF */
static const uint16_t JPEG_EOI_MARKER = 0xD9FF; /* EOI = FF D9 */

static int cam_verify_jpeg_soi(const uint8_t *inbuf, uint32_t length)
{
for (uint32_t i = 0; i < length; i++) {
if (memcmp(&inbuf[i], &JPEG_SOI_MARKER, 3) == 0) {
const size_t soi_len = sizeof(JPEG_SOI_MARKER);

if (length < soi_len) {
ESP_LOGW(TAG, "NO-SOI");
return -1;
}

for (uint32_t i = 0; i <= length - soi_len; i++) {
if (memcmp(&inbuf[i], JPEG_SOI_MARKER, soi_len) == 0) {
//ESP_LOGW(TAG, "SOI: %d", (int) i);
return i;
}
Expand Down Expand Up @@ -539,4 +547,4 @@ void cam_give_all(void) {
bool cam_get_available_frames(void)
{
return 0 < uxQueueMessagesWaiting(cam_obj->frame_buffer_queue);
}
}