mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 18:32:12 +02:00
ffmpeg: fix CVE-2021-38171
backport from upstream (From OE-Core rev: 130af0502d1ae6fe3721b83ff5218e3aa48dbf0d) Signed-off-by: Kiran Surendran <Kiran.Surendran@windriver.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0cc1b4141d
commit
01009831ed
@@ -0,0 +1,40 @@
|
||||
CVE: CVE-2021-38171
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Kiran Surendran <kiran.surendran@windriver.com>
|
||||
|
||||
From d5373a9efb10c1fa87698ee41370fb04dc2e410b 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 d937e2bea9..a1593515e1 100644
|
||||
--- a/libavformat/adtsenc.c
|
||||
+++ b/libavformat/adtsenc.c
|
||||
@@ -50,9 +50,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.31.1
|
||||
|
||||
@@ -32,6 +32,7 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
|
||||
file://fix-CVE-2020-22021.patch \
|
||||
file://fix-CVE-2020-22033-CVE-2020-22019.patch \
|
||||
file://fix-CVE-2021-38291.patch \
|
||||
file://fix-CVE-2021-38171.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user