| From 26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777 Mon Sep 17 00:00:00 2001 |
| From: Michael Niedermayer <michael@niedermayer.cc> |
| Date: Tue, 25 May 2021 19:29:18 +0200 |
| Subject: [PATCH] avcodec/exr: More strictly check dc_count |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| Fixes: out of array access |
| Fixes: exr/deneme |
| |
| Found-by: Burak Çarıkçı <burakcarikci@crypttech.com> |
| Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> |
| |
| |
| CVE: CVE-2021-33815 |
| Upstream-Status: Backport [26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777] |
| |
| Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> |
| --- |
| libavcodec/exr.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/libavcodec/exr.c b/libavcodec/exr.c |
| index 9377a89169..4648ed7d62 100644 |
| --- a/libavcodec/exr.c |
| +++ b/libavcodec/exr.c |
| @@ -1059,11 +1059,11 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size |
| bytestream2_skip(&gb, ac_size); |
| } |
| |
| - if (dc_size > 0) { |
| + { |
| unsigned long dest_len = dc_count * 2LL; |
| GetByteContext agb = gb; |
| |
| - if (dc_count > (6LL * td->xsize * td->ysize + 63) / 64) |
| + if (dc_count != dc_w * dc_h * 3) |
| return AVERROR_INVALIDDATA; |
| |
| av_fast_padded_malloc(&td->dc_data, &td->dc_size, FFALIGN(dest_len, 64) * 2); |
| -- |
| 2.32.0 |
| |