mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: fix CVE-2024-28661

Browse Source 
Some of the changes are already present in recipe version

Ref:
148ada5577
https://ffmpeg.org/security.html

(From OE-Core rev: 4ca1544e95e327c7060efa845aa69c2a1eb1d782)

Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Archana Polampalli
2024-12-06 13:11:45 +00:00
committed by Steve Sakoman
parent 2f5de1668c
commit 34611ec3cb
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-28661.patch Normal file
View File

@@ -0,0 +1,37 @@
From 66b50445cb36cf6adb49c2397362509aedb42c71 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Fri, 16 Feb 2024 11:17:13 -0300
Subject: [PATCH 1/3] avcodec/speexdec: check for sane frame_size values
Regression since ab39cc36c72bb73318bb911acb66873de850a107.
Fixes heap buffer overflows
Fixes ticket #10866
Reported-by: sploitem <sploitem@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
CVE: CVE-2024-28661
Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/66b50445cb36cf6adb49c2397362509aedb42c71]
Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
---
libavcodec/speexdec.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c
index 08c7e77..23b8605 100644
--- a/libavcodec/speexdec.c
+++ b/libavcodec/speexdec.c
@@ -1422,6 +1422,7 @@ static int parse_speex_extradata(AVCodecContext *avctx,
s->frame_size = bytestream_get_le32(&buf);
if (s->frame_size < NB_FRAME_SIZE << s->mode)
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.40.0

1
meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
View File

@@ -33,6 +33,7 @@ SRC_URI = " \
file://CVE-2023-50008.patch \
file://CVE-2024-32230.patch \
file://CVE-2023-49501.patch \
file://CVE-2024-28661.patch \
"
SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"