diff options
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2021-38114.patch')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2021-38114.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2021-38114.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2021-38114.patch deleted file mode 100644 index ab3ecfecbb..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/fix-CVE-2021-38114.patch +++ /dev/null @@ -1,67 +0,0 @@ -CVE: CVE-2021-38114 -Upstream-Status: Backport -Signed-off-by: Kiran Surendran <kiran.surendran@windriver.com> - -From 463dbe4e78cc560ca5b09f23a07add0eb78ccee8 Mon Sep 17 00:00:00 2001 -From: maryam ebr <me22bee@outlook.com> -Date: Tue, 3 Aug 2021 01:05:47 -0400 -Subject: [PATCH] avcodec/dnxhddec: check and propagate function return value - -Similar to CVE-2013-0868, here return value check for 'init_vlc' is needed. -crafted DNxHD data can cause unspecified impact. - -Reviewed-by: Paul B Mahol <onemda@gmail.com> -Signed-off-by: James Almer <jamrial@gmail.com> ---- - libavcodec/dnxhddec.c | 22 +++++++++++++++------- - 1 file changed, 15 insertions(+), 7 deletions(-) - -diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c -index c78d55aee5..9b475a6979 100644 ---- a/libavcodec/dnxhddec.c -+++ b/libavcodec/dnxhddec.c -@@ -112,6 +112,7 @@ static av_cold int dnxhd_decode_init(AVCodecContext *avctx) - - static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid, int bitdepth) - { -+ int ret; - if (cid != ctx->cid) { - const CIDEntry *cid_table = ff_dnxhd_get_cid_table(cid); - -@@ -132,19 +133,26 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid, int bitdepth) - ff_free_vlc(&ctx->dc_vlc); - ff_free_vlc(&ctx->run_vlc); - -- init_vlc(&ctx->ac_vlc, DNXHD_VLC_BITS, 257, -+ if ((ret = init_vlc(&ctx->ac_vlc, DNXHD_VLC_BITS, 257, - ctx->cid_table->ac_bits, 1, 1, -- ctx->cid_table->ac_codes, 2, 2, 0); -- init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, bitdepth > 8 ? 14 : 12, -+ ctx->cid_table->ac_codes, 2, 2, 0)) < 0) -+ goto out; -+ if ((ret = init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, bitdepth > 8 ? 14 : 12, - ctx->cid_table->dc_bits, 1, 1, -- ctx->cid_table->dc_codes, 1, 1, 0); -- init_vlc(&ctx->run_vlc, DNXHD_VLC_BITS, 62, -+ ctx->cid_table->dc_codes, 1, 1, 0)) < 0) -+ goto out; -+ if ((ret = init_vlc(&ctx->run_vlc, DNXHD_VLC_BITS, 62, - ctx->cid_table->run_bits, 1, 1, -- ctx->cid_table->run_codes, 2, 2, 0); -+ ctx->cid_table->run_codes, 2, 2, 0)) < 0) -+ goto out; - - ctx->cid = cid; - } -- return 0; -+ ret = 0; -+out: -+ if (ret < 0) -+ av_log(ctx->avctx, AV_LOG_ERROR, "init_vlc failed\n"); -+ return ret; - } - - static int dnxhd_get_profile(int cid) --- -2.31.1 - |