mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
ffmpeg: fix CVE-2025-25473
FFmpeg git master before commit c08d30 was discovered to contain a NULL pointer dereference via the component libavformat/mov.c. (From OE-Core rev: abc6b3180b87c665ff04204b7163d1f074d99747) Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
1acf841038
commit
287838f419
@@ -0,0 +1,36 @@
|
|||||||
|
From c08d300481b8ebb846cd43a473988fdbc6793d1b Mon Sep 17 00:00:00 2001
|
||||||
|
From: James Almer <jamrial@gmail.com>
|
||||||
|
Date: Fri, 17 Jan 2025 00:05:31 -0300
|
||||||
|
Subject: [PATCH] avformat/avformat: also clear FFFormatContext packet queue
|
||||||
|
when closing a muxer
|
||||||
|
|
||||||
|
packet_buffer is used in mux.c, and if a muxing process fails at a point where
|
||||||
|
packets remained in said queue, they will leak.
|
||||||
|
|
||||||
|
Fixes ticket #11419
|
||||||
|
|
||||||
|
Signed-off-by: James Almer <jamrial@gmail.com>
|
||||||
|
|
||||||
|
CVE: CVE-2025-25473
|
||||||
|
|
||||||
|
Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/c08d300481b8ebb846cd43a473988fdbc6793d1b]
|
||||||
|
|
||||||
|
Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
|
||||||
|
---
|
||||||
|
libavformat/avformat.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/libavformat/avformat.c b/libavformat/avformat.c
|
||||||
|
index 5b8bb78..73f31cd 100644
|
||||||
|
--- a/libavformat/avformat.c
|
||||||
|
+++ b/libavformat/avformat.c
|
||||||
|
@@ -138,6 +138,7 @@ void avformat_free_context(AVFormatContext *s)
|
||||||
|
av_dict_free(&si->id3v2_meta);
|
||||||
|
av_packet_free(&si->pkt);
|
||||||
|
av_packet_free(&si->parse_pkt);
|
||||||
|
+ avpriv_packet_list_free(&si->packet_buffer);
|
||||||
|
av_freep(&s->streams);
|
||||||
|
ff_flush_packet_queue(s);
|
||||||
|
av_freep(&s->url);
|
||||||
|
--
|
||||||
|
2.40.0
|
||||||
@@ -47,6 +47,7 @@ SRC_URI = " \
|
|||||||
file://CVE-2024-36618.patch \
|
file://CVE-2024-36618.patch \
|
||||||
file://CVE-2024-36619.patch \
|
file://CVE-2024-36619.patch \
|
||||||
file://CVE-2024-35369.patch \
|
file://CVE-2024-35369.patch \
|
||||||
|
file://CVE-2025-25473.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
|
SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"
|
||||||
|
|||||||
Reference in New Issue
Block a user