|
 |
94b862 |
Backport of upstream commits:
|
|
|
94b862 |
|
|
|
94b862 |
From aa0b0f79ade5eef8b0e7a214c03f5af54b36ba7d Mon Sep 17 00:00:00 2001
|
|
|
94b862 |
From: Michael Adams <mdadams@ece.uvic.ca>
|
|
|
94b862 |
Date: Sat, 26 Nov 2016 17:14:09 -0800
|
|
|
94b862 |
Subject: [PATCH] Fixed numerous integer overflow problems in the code for
|
|
|
94b862 |
packet iterators in the JPC decoder.
|
|
|
94b862 |
|
|
|
94b862 |
From f25486c3d4aa472fec79150f2c41ed4333395d3d Mon Sep 17 00:00:00 2001
|
|
|
94b862 |
From: Michael Adams <mdadams@ece.uvic.ca>
|
|
|
94b862 |
Date: Sat, 26 Nov 2016 20:54:24 -0800
|
|
|
94b862 |
Subject: [PATCH] Fixed a bug in the packet iterator code. Added a new
|
|
|
94b862 |
regression test case.
|
|
|
94b862 |
|
|
|
94b862 |
From 99a50593254d1b53002719bbecfc946c84b23d27 Mon Sep 17 00:00:00 2001
|
|
|
94b862 |
From: Michael Adams <mdadams@ece.uvic.ca>
|
|
|
94b862 |
Date: Fri, 9 Dec 2016 05:42:39 -0800
|
|
|
94b862 |
Subject: [PATCH] Apply a patch for the following bug report:
|
|
|
94b862 |
https://github.com/mdadams/jasper/issues/103 Heap-Buffer-Overflow or
|
|
|
94b862 |
Null-pointer-dereference vulnerability due to a programming mistake
|
|
|
94b862 |
(off-by-1)
|
|
|
94b862 |
|
|
|
94b862 |
diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_types.h jasper-1.900.1/src/libjasper/include/jasper/jas_types.h
|
|
|
94b862 |
--- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_types.h 2007-01-19 22:43:04.000000000 +0100
|
|
|
94b862 |
+++ jasper-1.900.1/src/libjasper/include/jasper/jas_types.h 2017-03-30 22:12:18.000000000 +0200
|
|
|
94b862 |
@@ -217,6 +217,10 @@ typedef ulonglong uint_fast64_t;
|
|
|
94b862 |
#define JAS_CAST(t, e) \
|
|
|
94b862 |
((t) (e))
|
|
|
94b862 |
|
|
|
94b862 |
+/* The number of bits in the integeral type uint_fast32_t. */
|
|
|
94b862 |
+/* NOTE: This could underestimate the size on some exotic architectures. */
|
|
|
94b862 |
+#define JAS_UINTFAST32_NUMBITS (8 * sizeof(uint_fast32_t))
|
|
|
94b862 |
+
|
|
|
94b862 |
#ifdef __cplusplus
|
|
|
94b862 |
extern "C" {
|
|
|
94b862 |
#endif
|
|
|
94b862 |
diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
|
|
|
94b862 |
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c 2017-03-30 18:03:55.000000000 +0200
|
|
|
94b862 |
+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2017-03-30 22:14:39.000000000 +0200
|
|
|
94b862 |
@@ -249,10 +249,17 @@ static int jpc_pi_nextrpcl(register jpc_
|
|
|
94b862 |
++compno, ++picomp) {
|
|
|
94b862 |
for (rlvlno = 0, pirlvl = picomp->pirlvls; rlvlno <
|
|
|
94b862 |
picomp->numrlvls; ++rlvlno, ++pirlvl) {
|
|
|
94b862 |
- xstep = picomp->hsamp * (1 << (pirlvl->prcwidthexpn +
|
|
|
94b862 |
- picomp->numrlvls - rlvlno - 1));
|
|
|
94b862 |
- ystep = picomp->vsamp * (1 << (pirlvl->prcheightexpn +
|
|
|
94b862 |
- picomp->numrlvls - rlvlno - 1));
|
|
|
94b862 |
+ // Check for the potential for overflow problems.
|
|
|
94b862 |
+ if (pirlvl->prcwidthexpn + picomp->numrlvls >
|
|
|
94b862 |
+ JAS_UINTFAST32_NUMBITS - 2 ||
|
|
|
94b862 |
+ pirlvl->prcheightexpn + picomp->numrlvls >
|
|
|
94b862 |
+ JAS_UINTFAST32_NUMBITS - 2) {
|
|
|
94b862 |
+ return -1;
|
|
|
94b862 |
+ }
|
|
|
94b862 |
+ xstep = picomp->hsamp * (JAS_CAST(uint_fast32_t, 1) <<
|
|
|
94b862 |
+ (pirlvl->prcwidthexpn + picomp->numrlvls - rlvlno - 1));
|
|
|
94b862 |
+ ystep = picomp->vsamp * (JAS_CAST(uint_fast32_t, 1) <<
|
|
|
94b862 |
+ (pirlvl->prcheightexpn + picomp->numrlvls - rlvlno - 1));
|
|
|
94b862 |
pi->xstep = (!pi->xstep) ? xstep : JAS_MIN(pi->xstep, xstep);
|
|
|
94b862 |
pi->ystep = (!pi->ystep) ? ystep : JAS_MIN(pi->ystep, ystep);
|
|
|
94b862 |
}
|
|
|
94b862 |
@@ -282,21 +289,24 @@ static int jpc_pi_nextrpcl(register jpc_
|
|
|
94b862 |
rpy = r + pi->pirlvl->prcheightexpn;
|
|
|
94b862 |
trx0 = JPC_CEILDIV(pi->xstart, pi->picomp->hsamp << r);
|
|
|
94b862 |
try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
|
|
|
94b862 |
- if (((pi->x == pi->xstart && ((trx0 << r) % (1 << rpx)))
|
|
|
94b862 |
- || !(pi->x % (1 << rpx))) &&
|
|
|
94b862 |
- ((pi->y == pi->ystart && ((try0 << r) % (1 << rpy)))
|
|
|
94b862 |
- || !(pi->y % (1 << rpy)))) {
|
|
|
94b862 |
- prchind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->x, pi->picomp->hsamp
|
|
|
94b862 |
- << r), pi->pirlvl->prcwidthexpn) - JPC_FLOORDIVPOW2(trx0,
|
|
|
94b862 |
- pi->pirlvl->prcwidthexpn);
|
|
|
94b862 |
- prcvind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->y, pi->picomp->vsamp
|
|
|
94b862 |
- << r), pi->pirlvl->prcheightexpn) - JPC_FLOORDIVPOW2(try0,
|
|
|
94b862 |
- pi->pirlvl->prcheightexpn);
|
|
|
94b862 |
+ if (((pi->x == pi->xstart &&
|
|
|
94b862 |
+ ((trx0 << r) % (JAS_CAST(uint_fast32_t, 1) << rpx)))
|
|
|
94b862 |
+ || !(pi->x % (JAS_CAST(uint_fast32_t, 1) << rpx))) &&
|
|
|
94b862 |
+ ((pi->y == pi->ystart &&
|
|
|
94b862 |
+ ((try0 << r) % (JAS_CAST(uint_fast32_t, 1) << rpy)))
|
|
|
94b862 |
+ || !(pi->y % (JAS_CAST(uint_fast32_t, 1) << rpy)))) {
|
|
|
94b862 |
+ prchind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->x,
|
|
|
94b862 |
+ pi->picomp->hsamp << r), pi->pirlvl->prcwidthexpn) -
|
|
|
94b862 |
+ JPC_FLOORDIVPOW2(trx0, pi->pirlvl->prcwidthexpn);
|
|
|
94b862 |
+ prcvind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->y,
|
|
|
94b862 |
+ pi->picomp->vsamp << r), pi->pirlvl->prcheightexpn) -
|
|
|
94b862 |
+ JPC_FLOORDIVPOW2(try0, pi->pirlvl->prcheightexpn);
|
|
|
94b862 |
pi->prcno = prcvind * pi->pirlvl->numhprcs + prchind;
|
|
|
94b862 |
|
|
|
94b862 |
assert(pi->prcno < pi->pirlvl->numprcs);
|
|
|
94b862 |
for (pi->lyrno = 0; pi->lyrno <
|
|
|
94b862 |
- pi->numlyrs && pi->lyrno < JAS_CAST(int, pchg->lyrnoend); ++pi->lyrno) {
|
|
|
94b862 |
+ pi->numlyrs && pi->lyrno < JAS_CAST(int,
|
|
|
94b862 |
+ pchg->lyrnoend); ++pi->lyrno) {
|
|
|
94b862 |
prclyrno = &pi->pirlvl->prclyrnos[pi->prcno];
|
|
|
94b862 |
if (pi->lyrno >= *prclyrno) {
|
|
|
94b862 |
++(*prclyrno);
|
|
|
94b862 |
@@ -341,16 +351,19 @@ static int jpc_pi_nextpcrl(register jpc_
|
|
|
94b862 |
++compno, ++picomp) {
|
|
|
94b862 |
for (rlvlno = 0, pirlvl = picomp->pirlvls; rlvlno <
|
|
|
94b862 |
picomp->numrlvls; ++rlvlno, ++pirlvl) {
|
|
|
94b862 |
- xstep = picomp->hsamp * (1 <<
|
|
|
94b862 |
- (pirlvl->prcwidthexpn + picomp->numrlvls -
|
|
|
94b862 |
- rlvlno - 1));
|
|
|
94b862 |
- ystep = picomp->vsamp * (1 <<
|
|
|
94b862 |
- (pirlvl->prcheightexpn + picomp->numrlvls -
|
|
|
94b862 |
- rlvlno - 1));
|
|
|
94b862 |
- pi->xstep = (!pi->xstep) ? xstep :
|
|
|
94b862 |
- JAS_MIN(pi->xstep, xstep);
|
|
|
94b862 |
- pi->ystep = (!pi->ystep) ? ystep :
|
|
|
94b862 |
- JAS_MIN(pi->ystep, ystep);
|
|
|
94b862 |
+ // Check for the potential for overflow problems.
|
|
|
94b862 |
+ if (pirlvl->prcwidthexpn + picomp->numrlvls >
|
|
|
94b862 |
+ JAS_UINTFAST32_NUMBITS - 2 ||
|
|
|
94b862 |
+ pirlvl->prcheightexpn + picomp->numrlvls >
|
|
|
94b862 |
+ JAS_UINTFAST32_NUMBITS - 2) {
|
|
|
94b862 |
+ return -1;
|
|
|
94b862 |
+ }
|
|
|
94b862 |
+ xstep = picomp->hsamp * (JAS_CAST(uint_fast32_t, 1) <<
|
|
|
94b862 |
+ (pirlvl->prcwidthexpn + picomp->numrlvls - rlvlno - 1));
|
|
|
94b862 |
+ ystep = picomp->vsamp * (JAS_CAST(uint_fast32_t, 1) <<
|
|
|
94b862 |
+ (pirlvl->prcheightexpn + picomp->numrlvls - rlvlno - 1));
|
|
|
94b862 |
+ pi->xstep = (!pi->xstep) ? xstep : JAS_MIN(pi->xstep, xstep);
|
|
|
94b862 |
+ pi->ystep = (!pi->ystep) ? ystep : JAS_MIN(pi->ystep, ystep);
|
|
|
94b862 |
}
|
|
|
94b862 |
}
|
|
|
94b862 |
pi->prgvolfirst = 0;
|
|
|
94b862 |
@@ -377,20 +390,23 @@ static int jpc_pi_nextpcrl(register jpc_
|
|
|
94b862 |
try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
|
|
|
94b862 |
rpx = r + pi->pirlvl->prcwidthexpn;
|
|
|
94b862 |
rpy = r + pi->pirlvl->prcheightexpn;
|
|
|
94b862 |
- if (((pi->x == pi->xstart && ((trx0 << r) % (1 << rpx))) ||
|
|
|
94b862 |
+ if (((pi->x == pi->xstart &&
|
|
|
94b862 |
+ ((trx0 << r) % (JAS_CAST(uint_fast32_t, 1) << rpx))) ||
|
|
|
94b862 |
!(pi->x % (pi->picomp->hsamp << rpx))) &&
|
|
|
94b862 |
- ((pi->y == pi->ystart && ((try0 << r) % (1 << rpy))) ||
|
|
|
94b862 |
+ ((pi->y == pi->ystart &&
|
|
|
94b862 |
+ ((try0 << r) % (JAS_CAST(uint_fast32_t, 1) << rpy))) ||
|
|
|
94b862 |
!(pi->y % (pi->picomp->vsamp << rpy)))) {
|
|
|
94b862 |
- prchind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->x, pi->picomp->hsamp
|
|
|
94b862 |
- << r), pi->pirlvl->prcwidthexpn) - JPC_FLOORDIVPOW2(trx0,
|
|
|
94b862 |
- pi->pirlvl->prcwidthexpn);
|
|
|
94b862 |
- prcvind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->y, pi->picomp->vsamp
|
|
|
94b862 |
- << r), pi->pirlvl->prcheightexpn) - JPC_FLOORDIVPOW2(try0,
|
|
|
94b862 |
- pi->pirlvl->prcheightexpn);
|
|
|
94b862 |
+ prchind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->x,
|
|
|
94b862 |
+ pi->picomp->hsamp << r), pi->pirlvl->prcwidthexpn) -
|
|
|
94b862 |
+ JPC_FLOORDIVPOW2(trx0, pi->pirlvl->prcwidthexpn);
|
|
|
94b862 |
+ prcvind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->y,
|
|
|
94b862 |
+ pi->picomp->vsamp << r), pi->pirlvl->prcheightexpn) -
|
|
|
94b862 |
+ JPC_FLOORDIVPOW2(try0, pi->pirlvl->prcheightexpn);
|
|
|
94b862 |
pi->prcno = prcvind * pi->pirlvl->numhprcs + prchind;
|
|
|
94b862 |
assert(pi->prcno < pi->pirlvl->numprcs);
|
|
|
94b862 |
for (pi->lyrno = 0; pi->lyrno < pi->numlyrs &&
|
|
|
94b862 |
- pi->lyrno < JAS_CAST(int, pchg->lyrnoend); ++pi->lyrno) {
|
|
|
94b862 |
+ pi->lyrno < JAS_CAST(int, pchg->lyrnoend);
|
|
|
94b862 |
+ ++pi->lyrno) {
|
|
|
94b862 |
prclyrno = &pi->pirlvl->prclyrnos[pi->prcno];
|
|
|
94b862 |
if (pi->lyrno >= *prclyrno) {
|
|
|
94b862 |
++(*prclyrno);
|
|
|
94b862 |
@@ -428,10 +444,17 @@ static int jpc_pi_nextcprl(register jpc_
|
|
|
94b862 |
pi->prgvolfirst = 0;
|
|
|
94b862 |
}
|
|
|
94b862 |
|
|
|
94b862 |
- for (pi->compno = pchg->compnostart, pi->picomp =
|
|
|
94b862 |
- &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps; ++pi->compno,
|
|
|
94b862 |
- ++pi->picomp) {
|
|
|
94b862 |
+ for (pi->compno = pchg->compnostart, pi->picomp = &pi->picomps[pi->compno];
|
|
|
94b862 |
+ pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps;
|
|
|
94b862 |
+ ++pi->compno, ++pi->picomp) {
|
|
|
94b862 |
pirlvl = pi->picomp->pirlvls;
|
|
|
94b862 |
+ // Check for the potential for overflow problems.
|
|
|
94b862 |
+ if (pirlvl->prcwidthexpn + pi->picomp->numrlvls >
|
|
|
94b862 |
+ JAS_UINTFAST32_NUMBITS - 2 ||
|
|
|
94b862 |
+ pirlvl->prcheightexpn + pi->picomp->numrlvls >
|
|
|
94b862 |
+ JAS_UINTFAST32_NUMBITS - 2) {
|
|
|
94b862 |
+ return -1;
|
|
|
94b862 |
+ }
|
|
|
94b862 |
pi->xstep = pi->picomp->hsamp * (JAS_CAST(uint_fast32_t, 1) <<
|
|
|
94b862 |
(pirlvl->prcwidthexpn + pi->picomp->numrlvls - 1));
|
|
|
94b862 |
pi->ystep = pi->picomp->vsamp * (JAS_CAST(uint_fast32_t, 1) <<
|
|
|
94b862 |
@@ -461,23 +484,23 @@ static int jpc_pi_nextcprl(register jpc_
|
|
|
94b862 |
try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
|
|
|
94b862 |
rpx = r + pi->pirlvl->prcwidthexpn;
|
|
|
94b862 |
rpy = r + pi->pirlvl->prcheightexpn;
|
|
|
94b862 |
- if (((pi->x == pi->xstart && ((trx0 << r) % (1 << rpx))) ||
|
|
|
94b862 |
+ if (((pi->x == pi->xstart &&
|
|
|
94b862 |
+ ((trx0 << r) % (JAS_CAST(uint_fast32_t, 1) << rpx))) ||
|
|
|
94b862 |
!(pi->x % (pi->picomp->hsamp << rpx))) &&
|
|
|
94b862 |
- ((pi->y == pi->ystart && ((try0 << r) % (1 << rpy))) ||
|
|
|
94b862 |
+ ((pi->y == pi->ystart &&
|
|
|
94b862 |
+ ((try0 << r) % (JAS_CAST(uint_fast32_t, 1) << rpy))) ||
|
|
|
94b862 |
!(pi->y % (pi->picomp->vsamp << rpy)))) {
|
|
|
94b862 |
- prchind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->x, pi->picomp->hsamp
|
|
|
94b862 |
- << r), pi->pirlvl->prcwidthexpn) - JPC_FLOORDIVPOW2(trx0,
|
|
|
94b862 |
- pi->pirlvl->prcwidthexpn);
|
|
|
94b862 |
- prcvind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->y, pi->picomp->vsamp
|
|
|
94b862 |
- << r), pi->pirlvl->prcheightexpn) - JPC_FLOORDIVPOW2(try0,
|
|
|
94b862 |
- pi->pirlvl->prcheightexpn);
|
|
|
94b862 |
- pi->prcno = prcvind *
|
|
|
94b862 |
- pi->pirlvl->numhprcs +
|
|
|
94b862 |
- prchind;
|
|
|
94b862 |
- assert(pi->prcno <
|
|
|
94b862 |
- pi->pirlvl->numprcs);
|
|
|
94b862 |
- for (pi->lyrno = 0; pi->lyrno <
|
|
|
94b862 |
- pi->numlyrs && pi->lyrno < JAS_CAST(int, pchg->lyrnoend); ++pi->lyrno) {
|
|
|
94b862 |
+ prchind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->x,
|
|
|
94b862 |
+ pi->picomp->hsamp << r), pi->pirlvl->prcwidthexpn) -
|
|
|
94b862 |
+ JPC_FLOORDIVPOW2(trx0, pi->pirlvl->prcwidthexpn);
|
|
|
94b862 |
+ prcvind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->y,
|
|
|
94b862 |
+ pi->picomp->vsamp << r), pi->pirlvl->prcheightexpn) -
|
|
|
94b862 |
+ JPC_FLOORDIVPOW2(try0, pi->pirlvl->prcheightexpn);
|
|
|
94b862 |
+ pi->prcno = prcvind * pi->pirlvl->numhprcs + prchind;
|
|
|
94b862 |
+ assert(pi->prcno < pi->pirlvl->numprcs);
|
|
|
94b862 |
+ for (pi->lyrno = 0; pi->lyrno < pi->numlyrs &&
|
|
|
94b862 |
+ pi->lyrno < JAS_CAST(int, pchg->lyrnoend);
|
|
|
94b862 |
+ ++pi->lyrno) {
|
|
|
94b862 |
prclyrno = &pi->pirlvl->prclyrnos[pi->prcno];
|
|
|
94b862 |
if (pi->lyrno >= *prclyrno) {
|
|
|
94b862 |
++(*prclyrno);
|