Skip to content

Fix #4: use-after-free of embeddedAddr in rs4_embed_cmsk() #6

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

Fix #4: use-after-free of embeddedAddr in rs4_embed_cmsk() #6

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
5 changes: 4 additions & 1 deletion import/chips/p9/utils/imageProcs/p9_scan_compression.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,6 @@ int
rs4_embed_cmsk( CompressedScanData** io_rs4,
CompressedScanData* i_rs4Cmsk )
{
char* embeddedAddr = (char*)(*io_rs4 + 1);
size_t embeddedSize = be16toh(i_rs4Cmsk->iv_size);
size_t totalSize = be16toh((*io_rs4)->iv_size) + embeddedSize;

Expand All @@ -931,6 +930,10 @@ rs4_embed_cmsk( CompressedScanData** io_rs4,
return BUG(SCAN_COMPRESSION_NO_MEMORY);
}

// realloc() above may move the buffer, so derive the embedded address from
// the (possibly new) *io_rs4 pointer rather than from the pre-realloc one.
char* embeddedAddr = (char*)(*io_rs4 + 1);

// Make space for cmsk ring
memmove(embeddedAddr + embeddedSize,
embeddedAddr,
Expand Down