[FFmpeg-devel] [PATCH 1/2] avformat/wavdec: Fix overflow of intermediate in block_align check

[FFmpeg-devel] [PATCH 1/2] avformat/wavdec: Fix overflow of intermediate in block_align check

[Michael Niedermayer]

Fixes: signed integer overflow: -251517880 * 32 cannot be represented in type 'int'
Fixes: 385224934/clusterfuzz-testcase-minimized-ffmpeg_dem_W64_fuzzer-4909298151915520

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/wavdec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 78e37b88d75..0e31c34d0af 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -912,10 +912,10 @@ static int w64_read_header(AVFormatContext *s)
             if (st->codecpar->block_align &&
                 st->codecpar->ch_layout.nb_channels < FF_SANE_NB_CHANNELS &&
                 st->codecpar->bits_per_coded_sample < 128) {
-                int block_align = st->codecpar->block_align;
+                int64_t block_align = st->codecpar->block_align;
 
                 block_align = FFMAX(block_align,
-                                    ((st->codecpar->bits_per_coded_sample + 7) / 8) *
+                                    ((st->codecpar->bits_per_coded_sample + 7) / 8LL) *
                                     st->codecpar->ch_layout.nb_channels);
                 if (block_align > st->codecpar->block_align) {
                     av_log(s, AV_LOG_WARNING, "invalid block_align: %d, broken file.\n",
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] avformat/mlvdec: fix size checks

[Michael Niedermayer]

Fixes: heap-buffer-overflow
Fixes: 391962476/clusterfuzz-testcase-minimized-ffmpeg_dem_MLV_fuzzer-5746746587676672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/mlvdec.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c
index 6f4fa80f32b..44f5c207559 100644
--- a/libavformat/mlvdec.c
+++ b/libavformat/mlvdec.c
@@ -471,6 +471,9 @@ static int get_packet_lj92(AVFormatContext *avctx, AVStream *st, AVIOContext *pb
     uint8_t *stripofs, *matrixofs;
 
 #define MAX_HEADER_SIZE 2048
+    if ((uint64_t)size > INT32_MAX - MAX_HEADER_SIZE)
+        return AVERROR_PATCHWELCOME;
+
     if ((ret = av_new_packet(pkt, size + MAX_HEADER_SIZE)) < 0)
         return ret;
 
@@ -562,10 +565,14 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
     avio_skip(pb, 12); //timestamp, frameNumber
     size -= 12;
     if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
+        if (size < 8)
+            return AVERROR_INVALIDDATA;
         avio_skip(pb, 8); // cropPosX, cropPosY, panPosX, panPosY
         size -= 8;
     }
     space = avio_rl32(pb);
+    if (size < space + 4LL)
+        return AVERROR_INVALIDDATA;
     avio_skip(pb, space);
     size -= space;
 
@@ -577,9 +584,7 @@ static int read_packet(AVFormatContext *avctx, AVPacket *pkt)
         else
             ret = av_get_packet(pb, pkt, (st->codecpar->width * st->codecpar->height * st->codecpar->bits_per_coded_sample + 7) >> 3);
     } else { // AVMEDIA_TYPE_AUDIO
-        if (space > UINT_MAX - 24 || size < (24 + space))
-            return AVERROR_INVALIDDATA;
-        ret = av_get_packet(pb, pkt, size - (24 + space));
+        ret = av_get_packet(pb, pkt, size - 4);
     }
 
     if (ret < 0)
-- 
2.48.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".