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: 599ee3f195bc66d57797c121fa0b73a901d6edfa)

Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Archana Polampalli
2025-02-21 06:03:07 +00:00
committed by Steve Sakoman
parent 89037ea118
commit 8167a4a932
2 changed files with 37 additions and 0 deletions

View File

@@ -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://github.com/ffmpeg/ffmpeg/commit/c08d300481b8ebb846cd43a473988fdbc6793d1b]
Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
---
libavformat/utils.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index cee86ae..fe458dd 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -724,6 +724,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

View File

@@ -50,6 +50,7 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \
file://CVE-2024-36618.patch \
file://CVE-2024-28661.patch \
file://CVE-2024-35369.patch \
file://CVE-2025-25473.patch \
"
SRC_URI[sha256sum] = "ef2efae259ce80a240de48ec85ecb062cecca26e4352ffb3fda562c21a93007b"