diff options
| author | Oliver Chang <ochang@chromium.org> | 2016-07-15 08:59:55 -0700 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2016-07-15 08:59:55 -0700 |
| commit | d4a13ae223f2c7d5e4ffae45daecb4cd5bdbef47 (patch) | |
| tree | 8652dfe4493629d12c41f45e04ca29f1e52eb4d3 | |
| parent | 6dceb53484b65aa73c2ebc25bbd83c59e1cd5b18 (diff) | |
| download | pdfium-d4a13ae223f2c7d5e4ffae45daecb4cd5bdbef47.tar.xz | |
Merge to M52: openjpeg: Prevent integer overflows during calculation of |l_nb_precinct_size|chromium/2743
TBR=thestig@chromium.org
BUG=625541
Original Review-Url: https://codereview.chromium.org/2124073003
(cherry picked from commit 2f6d1480a1be2b1f82c94219c2d99e67d7e0660d)
Review URL: https://codereview.chromium.org/2152743004 .
| -rw-r--r-- | third_party/libopenjpeg20/0017-tcd_init_tile.patch | 32 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/README.pdfium | 1 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/tcd.c | 7 |
3 files changed, 40 insertions, 0 deletions
diff --git a/third_party/libopenjpeg20/0017-tcd_init_tile.patch b/third_party/libopenjpeg20/0017-tcd_init_tile.patch new file mode 100644 index 0000000000..a04ac9f118 --- /dev/null +++ b/third_party/libopenjpeg20/0017-tcd_init_tile.patch @@ -0,0 +1,32 @@ +diff --git a/third_party/libopenjpeg20/0017-tcd_init_tile.patch b/third_party/libopenjpeg20/0017-tcd_init_tile.patch +new file mode 100644 +index 0000000..e69de29 +diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium +index 4852a42..97e6e8c 100644 +--- a/third_party/libopenjpeg20/README.pdfium ++++ b/third_party/libopenjpeg20/README.pdfium +@@ -26,4 +26,5 @@ Local Modifications: + 0014-opj_jp2_read_ihdr_leak.patch: Memory leak in opj_jp2_read_ihdr(). + 0015-read_SPCod_SPCoc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SPCod_SPCoc. + 0016-read_SQcd_SQcc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SQcd_SQcc. ++0017-tcd_init_tile.patch: Prevent integer overflows during calculation of |l_nb_precinct_size|. + TODO(thestig): List all the other patches. +diff --git a/third_party/libopenjpeg20/tcd.c b/third_party/libopenjpeg20/tcd.c +index aebe9be..673633c 100644 +--- a/third_party/libopenjpeg20/tcd.c ++++ b/third_party/libopenjpeg20/tcd.c +@@ -822,7 +822,14 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, + l_res->ph = (l_res->y0 == l_res->y1) ? 0 : (OPJ_UINT32)((l_br_prc_y_end - l_tl_prc_y_start) >> l_pdy); + /*fprintf(stderr, "\t\t\tres_pw=%d, res_ph=%d\n", l_res->pw, l_res->ph );*/ + ++ if (l_res->pw && ((OPJ_UINT32)-1) / l_res->pw < l_res->ph) { ++ return OPJ_FALSE; ++ } + l_nb_precincts = l_res->pw * l_res->ph; ++ ++ if (((OPJ_UINT32)-1) / (OPJ_UINT32)sizeof(opj_tcd_precinct_t) < l_nb_precincts) { ++ return OPJ_FALSE; ++ } + l_nb_precinct_size = l_nb_precincts * (OPJ_UINT32)sizeof(opj_tcd_precinct_t); + if (resno == 0) { + tlcbgxstart = l_tl_prc_x_start; diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium index 897cfa1ea2..243e10ed40 100644 --- a/third_party/libopenjpeg20/README.pdfium +++ b/third_party/libopenjpeg20/README.pdfium @@ -25,4 +25,5 @@ Local Modifications: 0013-attrib_fix.patch: Don't needlessly redefine __attribute__, https://github.com/uclouvain/openjpeg/issues/727 0015-read_SPCod_SPCoc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SPCod_SPCoc. 0016-read_SQcd_SQcc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SQcd_SQcc. +0017-tcd_init_tile.patch: Prevent integer overflows during calculation of |l_nb_precinct_size|. TODO(thestig): List all the other patches. diff --git a/third_party/libopenjpeg20/tcd.c b/third_party/libopenjpeg20/tcd.c index aebe9be96c..673633c09b 100644 --- a/third_party/libopenjpeg20/tcd.c +++ b/third_party/libopenjpeg20/tcd.c @@ -822,7 +822,14 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, l_res->ph = (l_res->y0 == l_res->y1) ? 0 : (OPJ_UINT32)((l_br_prc_y_end - l_tl_prc_y_start) >> l_pdy); /*fprintf(stderr, "\t\t\tres_pw=%d, res_ph=%d\n", l_res->pw, l_res->ph );*/ + if (l_res->pw && ((OPJ_UINT32)-1) / l_res->pw < l_res->ph) { + return OPJ_FALSE; + } l_nb_precincts = l_res->pw * l_res->ph; + + if (((OPJ_UINT32)-1) / (OPJ_UINT32)sizeof(opj_tcd_precinct_t) < l_nb_precincts) { + return OPJ_FALSE; + } l_nb_precinct_size = l_nb_precincts * (OPJ_UINT32)sizeof(opj_tcd_precinct_t); if (resno == 0) { tlcbgxstart = l_tl_prc_x_start; |