system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-09 12:54:23 +00:00
Code Issues Projects Releases Wiki Activity

LibGfx/ICC: Avoid buffer overrun when creating TextDescriptionTagData

Browse Source 
We now validate that the offsets used cannot overflow, preventing
possible buffer overruns.
This commit is contained in:
Tim Ledbetter 2023-10-12 22:30:19 +01:00 committed by Andreas Kling
parent 4b995542c4
commit c1d7a51391
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tests/LibGfx/TestICCProfile.cpp
View File

@ -262,6 +262,7 @@ TEST_CASE(to_lab)
TEST_CASE(malformed_profile)
{
Array test_inputs = {
TEST_INPUT("icc/oss-fuzz-testcase-57426.icc"sv),
TEST_INPUT("icc/oss-fuzz-testcase-59551.icc"sv),
TEST_INPUT("icc/oss-fuzz-testcase-60281.icc"sv)
};

BIN
Tests/LibGfx/test-inputs/icc/oss-fuzz-testcase-57426.icc Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 512 B

13
Userland/Libraries/LibGfx/ICC/TagTypes.cpp
View File

@ -1054,7 +1054,9 @@ ErrorOr<NonnullRefPtr<TextDescriptionTagData>> TextDescriptionTagData::from_byte
return Error::from_string_literal("ICC::Profile: textDescriptionType has not enough data for ASCII size");
u32 ascii_description_length = *bit_cast<BigEndian<u32> const*>(bytes.data() + 8);
if (bytes.size() < 3 * sizeof(u32) + ascii_description_length)
Checked<u32> ascii_description_end = 3 * sizeof(u32);
ascii_description_end += ascii_description_length;
if (ascii_description_end.has_overflow() || bytes.size() < ascii_description_end.value())
return Error::from_string_literal("ICC::Profile: textDescriptionType has not enough data for ASCII description");
u8 const* ascii_description_data = bytes.data() + 3 * sizeof(u32);
@ -1073,7 +1075,9 @@ ErrorOr<NonnullRefPtr<TextDescriptionTagData>> TextDescriptionTagData::from_byte
// Unicode
if (bytes.size() < 3 * sizeof(u32) + ascii_description_length + 2 * sizeof(u32))
Checked<u32> unicode_metadata_end = ascii_description_end;
unicode_metadata_end += 2 * sizeof(u32);
if (unicode_metadata_end.has_overflow() || bytes.size() < unicode_metadata_end.value())
return Error::from_string_literal("ICC::Profile: textDescriptionType has not enough data for Unicode metadata");
// "Because the Unicode language code and Unicode count immediately follow the ASCII description,
@ -1088,7 +1092,10 @@ ErrorOr<NonnullRefPtr<TextDescriptionTagData>> TextDescriptionTagData::from_byte
u32 unicode_description_length = (u32)(cursor[0] << 24) | (u32)(cursor[1] << 16) | (u32)(cursor[2] << 8) | (u32)cursor[3];
cursor += 4;
if (bytes.size() < 3 * sizeof(u32) + ascii_description_length + 2 * sizeof(u32) + 2 * unicode_description_length)
Checked<u32> unicode_desciption_end = unicode_description_length;
unicode_desciption_end *= 2;
unicode_desciption_end += unicode_metadata_end;
if (unicode_desciption_end.has_overflow() || bytes.size() < unicode_desciption_end.value())
return Error::from_string_literal("ICC::Profile: textDescriptionType has not enough data for Unicode description");
u8 const* unicode_description_data = cursor;