[FFmpeg-devel] [PATCH] avcodec/speexdec: check for sane s->frame_size values

[FFmpeg-devel] [PATCH] avcodec/speexdec: check for sane s->frame_size values

[James Almer]

Fixes heap buffer overflows

Reported-by: sploitem <sploitem@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/speexdec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c
index 51c5834769..4d8052d585 100644
--- a/libavcodec/speexdec.c
+++ b/libavcodec/speexdec.c
@@ -1420,7 +1420,10 @@ static int parse_speex_extradata(AVCodecContext *avctx,
     if (s->nb_channels <= 0 || s->nb_channels > 2)
         return AVERROR_INVALIDDATA;
     s->bitrate = bytestream_get_le32(&buf);
-    s->frame_size = (1 + (s->mode > 0)) * bytestream_get_le32(&buf);
+    s->frame_size = bytestream_get_le32(&buf);
+    if (s->frame_size < NB_FRAME_SIZE << (s->mode > 0))
+        return AVERROR_INVALIDDATA;
+    s->frame_size *= 1 + (s->mode > 0);
     s->vbr = bytestream_get_le32(&buf);
     s->frames_per_packet = bytestream_get_le32(&buf);
     if (s->frames_per_packet <= 0 ||
-- 
2.43.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".

Re: [FFmpeg-devel] [PATCH] avcodec/speexdec: check for sane s->frame_size values

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 586 bytes --]

On Fri, Feb 16, 2024 at 11:19:25AM -0300, James Almer wrote:
> Fixes heap buffer overflows
> 
> Reported-by: sploitem <sploitem@gmail.com>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/speexdec.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

ok, though note that i do not know speexdec.c well enough to say that this
is or is not sufficient

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

During times of universal deceit, telling the truth becomes a
revolutionary act. -- George Orwell

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".