fkastl/ffmpeg-4
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-4
Code Pull Requests Activity

Accepting request 914527 from home:AZhou:branches:multimedia:libs

Browse Source 
- Add ffmpeg-CVE-2021-38171.patch: Backport from upstream to fix
  adts_decode_extradata in libavformat/adtsenc.c in FFmpeg 4.4
  does not check the init_get_bits return value (bsc#1189724).

OBS-URL: https://build.opensuse.org/request/show/914527
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=169
This commit is contained in:
Jan Engelhardt 2021-08-27 08:02:39 +00:00 committed by Git OBS Bridge
parent f5b32b2276
commit 691f3202a0
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ffmpeg-4.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Aug 27 07:09:15 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>
- Add ffmpeg-CVE-2021-38171.patch: Backport from upstream to fix
adts_decode_extradata in libavformat/adtsenc.c in FFmpeg 4.4
does not check the init_get_bits return value (bsc#1189724).
-------------------------------------------------------------------
Tue Aug 10 09:38:39 UTC 2021 - Alynx Zhou <alynx.zhou@suse.com>

1
ffmpeg-4.spec
View File

@ -120,6 +120,7 @@ Patch8: vmaf-trim-usr-local.patch
Patch9: ffmpeg-4.4-CVE-2020-22046.patch
Patch10: ffmpeg-CVE-2021-33815.patch
Patch11: ffmpeg-CVE-2021-38114.patch
Patch12: ffmpeg-CVE-2021-38171.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel

36
ffmpeg-CVE-2021-38171.patch Normal file
View File

@ -0,0 +1,36 @@
From 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 Mon Sep 17 00:00:00 2001
From: maryam ebrahimzadeh <me22bee@outlook.com>
Date: Wed, 4 Aug 2021 16:15:18 -0400
Subject: [PATCH] avformat/adtsenc: return value check for init_get_bits in
adts_decode_extradata
As the second argument for init_get_bits (buf) can be crafted, a return value check for this function call is necessary.
'buf' is part of 'AVPacket pkt'.
replace init_get_bits with init_get_bits8.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavformat/adtsenc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index ba15c0a724..3924e678d9 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -53,9 +53,11 @@ static int adts_decode_extradata(AVFormatContext *s, ADTSContext *adts, const ui
GetBitContext gb;
PutBitContext pb;
MPEG4AudioConfig m4ac;
- int off;
+ int off, ret;
- init_get_bits(&gb, buf, size * 8);
+ ret = init_get_bits8(&gb, buf, size);
+ if (ret < 0)
+ return ret;
off = avpriv_mpeg4audio_get_config2(&m4ac, buf, size, 1, s);
if (off < 0)
return off;
--
2.33.0