Patrick Williams | 213cb26 | 2021-08-07 19:21:33 -0500 | [diff] [blame] | 1 | From 26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Niedermayer <michael@niedermayer.cc> |
| 3 | Date: Tue, 25 May 2021 19:29:18 +0200 |
| 4 | Subject: [PATCH] avcodec/exr: More strictly check dc_count |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Fixes: out of array access |
| 10 | Fixes: exr/deneme |
| 11 | |
| 12 | Found-by: Burak Çarıkçı <burakcarikci@crypttech.com> |
| 13 | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> |
| 14 | |
| 15 | |
| 16 | CVE: CVE-2021-33815 |
| 17 | Upstream-Status: Backport [26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777] |
| 18 | |
| 19 | Signed-off-by: Tony Tascioglu <tony.tascioglu@windriver.com> |
| 20 | --- |
| 21 | libavcodec/exr.c | 4 ++-- |
| 22 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 23 | |
| 24 | diff --git a/libavcodec/exr.c b/libavcodec/exr.c |
| 25 | index 9377a89169..4648ed7d62 100644 |
| 26 | --- a/libavcodec/exr.c |
| 27 | +++ b/libavcodec/exr.c |
| 28 | @@ -1059,11 +1059,11 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size |
| 29 | bytestream2_skip(&gb, ac_size); |
| 30 | } |
| 31 | |
| 32 | - if (dc_size > 0) { |
| 33 | + { |
| 34 | unsigned long dest_len = dc_count * 2LL; |
| 35 | GetByteContext agb = gb; |
| 36 | |
| 37 | - if (dc_count > (6LL * td->xsize * td->ysize + 63) / 64) |
| 38 | + if (dc_count != dc_w * dc_h * 3) |
| 39 | return AVERROR_INVALIDDATA; |
| 40 | |
| 41 | av_fast_padded_malloc(&td->dc_data, &td->dc_size, FFALIGN(dest_len, 64) * 2); |
| 42 | -- |
| 43 | 2.32.0 |
| 44 | |