smacker: Check that the data size is a multiple of a sample vector
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 15 Nov 2015 13:52:08 +0000 (14:52 +0100)
committerDiego Biurrun <diego@biurrun.de>
Thu, 1 Jun 2017 15:01:32 +0000 (17:01 +0200)
Fixes out of array access
Fixes: ce19e41f0ef1e52a23edc488faecdb58/asan_heap-oob_2504e97_4202_ffa0df1baed14022b9bfd4f8ac23d0cb.smk

Bug-Id: CVE-2015-8365
CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4a9af07a49295e014b059c1ab624c40345af5892)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
(cherry picked from commit b98f082d8ddc0a0d8317114d8414ab51de60ef02)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
libavcodec/smacker.c

index bce23f4..d2a612c 100644 (file)
@@ -634,6 +634,11 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
         av_log(avctx, AV_LOG_ERROR, "sample format mismatch\n");
         return AVERROR(EINVAL);
     }
+    if (unp_size % (avctx->channels * (bits + 1))) {
+        av_log(avctx, AV_LOG_ERROR,
+               "The buffer does not contain an integer number of samples\n");
+        return AVERROR(EINVAL);
+    }
 
     /* get output buffer */
     s->frame.nb_samples = unp_size / (avctx->channels * (bits + 1));