CVE-2020-6851.patch 1.3 KB

123456789101112131415161718192021222324252627282930313233343536
  1. From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
  2. From: Even Rouault <even.rouault@spatialys.com>
  3. Date: Sat, 11 Jan 2020 01:51:19 +0100
  4. Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
  5. coordinates are beyond INT_MAX (fixes #1228)
  6. CVE: CVE-2020-6851
  7. Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com>
  8. ---
  9. src/lib/openjp2/j2k.c | 8 ++++++++
  10. 1 file changed, 8 insertions(+)
  11. diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
  12. index 14f6ff41..922550eb 100644
  13. --- a/src/lib/openjp2/j2k.c
  14. +++ b/src/lib/openjp2/j2k.c
  15. @@ -9236,6 +9236,14 @@ static OPJ_BOOL opj_j2k_update_image_dim
  16. l_img_comp = p_image->comps;
  17. for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
  18. OPJ_INT32 l_h, l_w;
  19. + if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
  20. + p_image->y0 > (OPJ_UINT32)INT_MAX ||
  21. + p_image->x1 > (OPJ_UINT32)INT_MAX ||
  22. + p_image->y1 > (OPJ_UINT32)INT_MAX) {
  23. + opj_event_msg(p_manager, EVT_ERROR,
  24. + "Image coordinates above INT_MAX are not supported\n");
  25. + return OPJ_FALSE;
  26. + }
  27. l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
  28. (OPJ_INT32)l_img_comp->dx);
  29. --
  30. 2.17.1