Skip to content

Fix numhprcs*numvprcs overflow defeating numprcs limit #430

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

Fix numhprcs*numvprcs overflow defeating numprcs limit #430

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
19 changes: 11 additions & 8 deletions src/libjasper/jpc/jpc_dec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,17 @@ static int jpc_dec_tileinit(jpc_dec_t *dec, jpc_dec_tile_t *tile)
rlvl->prcwidthexpn;
rlvl->numvprcs = (brprcyend - tlprcystart) >>
rlvl->prcheightexpn;
/* The product numhprcs * numvprcs must be evaluated in
64 bits so that a wrapped result cannot defeat the
limit check below. */
if (JAS_CAST(uint_fast64_t, rlvl->numhprcs) *
rlvl->numvprcs >= 64 * 1024) {
/* avoid out-of-memory due to
malicious file; this limit is
rather arbitrary; "good" files I
have seen have values 1..12 */
return -1;
}
rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;

if (jas_get_debug_level() >= 10) {
Expand All @@ -809,14 +820,6 @@ static int jpc_dec_tileinit(jpc_dec_t *dec, jpc_dec_tile_t *tile)
rlvl->numhprcs, rlvl->numvprcs, rlvl->numprcs);
}

if (rlvl->numprcs >= 64 * 1024) {
/* avoid out-of-memory due to
malicious file; this limit is
rather arbitrary; "good" files I
have seen have values 1..12 */
return -1;
}

if (rlvl->xstart >= rlvl->xend || rlvl->ystart >= rlvl->yend) {
rlvl->bands = 0;
rlvl->numprcs = 0;
Expand Down