From: Alex Tutubalin Date: Sat, 1 Feb 2025 15:32:39 +0300 Subject: Prevent out-of-bounds read in fuji 0xf00c tag parser Prevent out-of-bounds read in fuji 0xf00c tag parser prevent OOB reads in phase_one_correct (cherry picked from commit 66fe663e02a4dd610b4e832f5d9af326709336c2) --- src/decoders/load_mfbacks.cpp | 18 ++++++++++++++---- src/metadata/tiff.cpp | 27 +++++++++++++++++---------- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/decoders/load_mfbacks.cpp b/src/decoders/load_mfbacks.cpp index 9d7c051..ded154c 100644 --- a/src/decoders/load_mfbacks.cpp +++ b/src/decoders/load_mfbacks.cpp @@ -331,6 +331,9 @@ int LibRaw::phase_one_correct() fseek(ifp, off_412, SEEK_SET); for (i = 0; i < 9; i++) head[i] = get4() & 0x7fff; + unsigned w0 = head[1] * head[3], w1 = head[2] * head[4]; + if (w0 > 10240000 || w1 > 10240000) + throw LIBRAW_EXCEPTION_ALLOC; yval[0] = (float *)calloc(head[1] * head[3] + head[2] * head[4], 6); merror(yval[0], "phase_one_correct()"); yval[1] = (float *)(yval[0] + head[1] * head[3]); @@ -356,10 +359,17 @@ int LibRaw::phase_one_correct() for (k = j = 0; j < head[1]; j++) if (num < xval[0][k = head[1] * i + j]) break; - frac = (j == 0 || j == head[1]) - ? 0 - : (xval[0][k] - num) / (xval[0][k] - xval[0][k - 1]); - mult[i - cip] = yval[0][k - 1] * frac + yval[0][k] * (1 - frac); + if (j == 0 || j == head[1] || k < 1 || k >= w0+w1) + frac = 0; + else + { + int xdiv = (xval[0][k] - xval[0][k - 1]); + frac = xdiv ? (xval[0][k] - num) / (xval[0][k] - xval[0][k - 1]) : 0; + } + if (k < w0 + w1) + mult[i - cip] = yval[0][k > 0 ? k - 1 : 0] * frac + yval[0][k] * (1 - frac); + else + mult[i - cip] = 0; } i = ((mult[0] * (1 - cfrac) + mult[1] * cfrac) * row + num) * 2; RAW(row, col) = LIM(i, 0, 65535); diff --git a/src/metadata/tiff.cpp b/src/metadata/tiff.cpp index cd2406d..53a8c04 100644 --- a/src/metadata/tiff.cpp +++ b/src/metadata/tiff.cpp @@ -980,18 +980,21 @@ int LibRaw::parse_tiff_ifd(int base) if ((fwb[0] == rafdata[fi]) && (fwb[1] == rafdata[fi + 1]) && (fwb[2] == rafdata[fi + 2])) { - if (rafdata[fi - 15] != + if (fi > 14 && rafdata[fi - 15] != fwb[0]) // 15 is offset of Tungsten WB from the first // preset, Fine Weather WB continue; - for (int wb_ind = 0, ofst = fi - 15; wb_ind < Fuji_wb_list1.size(); - wb_ind++, ofst += 3) - { - icWBC[Fuji_wb_list1[wb_ind]][1] = - icWBC[Fuji_wb_list1[wb_ind]][3] = rafdata[ofst]; - icWBC[Fuji_wb_list1[wb_ind]][0] = rafdata[ofst + 1]; - icWBC[Fuji_wb_list1[wb_ind]][2] = rafdata[ofst + 2]; - } + if (fi >= 15) + { + for (int wb_ind = 0, ofst = fi - 15; wb_ind < (int)Fuji_wb_list1.size(); + wb_ind++, ofst += 3) + { + icWBC[Fuji_wb_list1[wb_ind]][1] = + icWBC[Fuji_wb_list1[wb_ind]][3] = rafdata[ofst]; + icWBC[Fuji_wb_list1[wb_ind]][0] = rafdata[ofst + 1]; + icWBC[Fuji_wb_list1[wb_ind]][2] = rafdata[ofst + 2]; + } + } if ((imFuji.RAFDataVersion == 0x0260) || // X-Pro3 (imFuji.RAFDataVersion == 0x0261) || // X100V @@ -1000,6 +1003,8 @@ int LibRaw::parse_tiff_ifd(int base) fi += 96; for (fj = fi; fj < (fi + 15); fj += 3) { + if (fj > libraw_internal_data.unpacker_data.lenRAFData - 3) + break; if (rafdata[fj] != rafdata[fi]) { fj -= 93; @@ -1009,7 +1014,9 @@ int LibRaw::parse_tiff_ifd(int base) (imFuji.RAFDataVersion == 0x0261) || // X100V (imFuji.RAFDataVersion == 0x0262)) // X-T4 fj -= 9; - for (int iCCT = 0, ofst = fj; iCCT < 31; +//printf ("wb start in DNG: 0x%04x\n", fj*2-0x4e); + for (int iCCT = 0, ofst = fj; iCCT < 31 + && ofst < libraw_internal_data.unpacker_data.lenRAFData - 3; iCCT++, ofst += 3) { icWBCCTC[iCCT][0] = FujiCCT_K[iCCT];