Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 7/9] avformat/genh: Check nb_channels for IMA ADPCM
Date: Sat, 17 Sep 2022 23:15:55 +0200
Message-ID: <20220917211557.11547-7-michael@niedermayer.cc> (raw)
In-Reply-To: <20220917211557.11547-1-michael@niedermayer.cc>

The check could be made more strict

Fixes: signed integer overflow: 36 * 538976288 cannot be represented in type 'int'
Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_GENH_fuzzer-6539389873815552

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

diff --git a/libavformat/genh.c b/libavformat/genh.c
index a25d4d625a4..1f707b55552 100644
--- a/libavformat/genh.c
+++ b/libavformat/genh.c
@@ -78,6 +78,8 @@ static int genh_read_header(AVFormatContext *s)
     case  0: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX;        break;
     case  1:
     case 11: st->codecpar->bits_per_coded_sample = 4;
+             if (st->codecpar->ch_layout.nb_channels > INT_MAX / 36)
+                return AVERROR_INVALIDDATA;
              st->codecpar->block_align = 36 * st->codecpar->ch_layout.nb_channels;
              st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_WAV;    break;
     case  2: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_DTK;        break;
-- 
2.17.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".

  parent reply	other threads:[~2022-09-17 21:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-17 21:15 [FFmpeg-devel] [PATCH 1/9] avformat/ape: Check frames size Michael Niedermayer
2022-09-17 21:15 ` [FFmpeg-devel] [PATCH 2/9] avformat/apm: Use 64bit for bit_rate computation Michael Niedermayer
2022-09-17 21:15 ` [FFmpeg-devel] [PATCH 3/9] avformat/asfdec_o: Limit packet offset Michael Niedermayer
2022-09-17 21:15 ` [FFmpeg-devel] [PATCH 4/9] avformat/cafdec: Check that nb_frasmes fits within 64bit Michael Niedermayer
2022-09-17 21:15 ` [FFmpeg-devel] [PATCH 5/9] avformat/dhav: Use 64bit seek_back Michael Niedermayer
2022-09-17 21:15 ` [FFmpeg-devel] [PATCH 6/9] avformat/dxa: avoid bpc overflows Michael Niedermayer
2022-09-17 21:15 ` Michael Niedermayer [this message]
2022-09-17 21:15 ` [FFmpeg-devel] [PATCH 8/9] avformat/icodec: Check nb_pal Michael Niedermayer
2022-09-17 23:11   ` Peter Ross
2022-09-17 21:15 ` [FFmpeg-devel] [PATCH 9/9] avformat/jacosubdec: Fix overflow in get_shift() Michael Niedermayer
2022-09-23 21:03 ` [FFmpeg-devel] [PATCH 1/9] avformat/ape: Check frames size Michael Niedermayer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220917211557.11547-7-michael@niedermayer.cc \
    --to=michael@niedermayer.cc \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git