Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ffmpeg-4 for openSUSE:Factory
checked in at 2021-09-03 21:25:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ffmpeg-4 (Old)
and /work/SRC/openSUSE:Factory/.ffmpeg-4.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg-4"
Fri Sep 3 21:25:32 2021 rev:43 rq:914535 version:4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/ffmpeg-4/ffmpeg-4.changes 2021-08-12
09:02:12.242099543 +0200
+++ /work/SRC/openSUSE:Factory/.ffmpeg-4.new.1899/ffmpeg-4.changes
2021-09-03 21:25:38.418143491 +0200
@@ -1,0 +2,7 @@
+Fri Aug 27 07:09:15 UTC 2021 - Alynx Zhou <alynx.z...@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).
+
+-------------------------------------------------------------------
New:
----
ffmpeg-CVE-2021-38171.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ffmpeg-4.spec ++++++
--- /var/tmp/diff_new_pack.Q8HwGn/_old 2021-09-03 21:25:39.006144104 +0200
+++ /var/tmp/diff_new_pack.Q8HwGn/_new 2021-09-03 21:25:39.010144107 +0200
@@ -120,6 +120,7 @@
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
++++++ ffmpeg-CVE-2021-38171.patch ++++++
>From 9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6 Mon Sep 17 00:00:00 2001
From: maryam ebrahimzadeh <me22...@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 <mich...@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
