ffmpeg: fix CVE-2024-31582

(From OE-Core rev: 617a9cdba6e2f0bd3ccc24e7bb2fe84e9573fecd)

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-08-06 06:35:37 +00:00
committed by Steve Sakoman
parent c0af0a839b
commit 0c1651298d
2 changed files with 35 additions and 0 deletions

View File

@@ -0,0 +1,34 @@
From 1d1a05b393ece9fa3df825bfef3724b7370aefdc Mon Sep 17 00:00:00 2001
From: Zhao Zhili <zhilizhao@tencent.com>
Date: Fri, 29 Dec 2023 05:56:43 +0800
Subject: [PATCH] avfilter/vf_codecview: fix heap buffer overflow
And improve the performance by a little bit.
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
CVE: CVE-2024-31582
Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/99debe5f823f45a482e1dc08de35879aa9c74bd2]
Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
---
libavfilter/vf_codecview.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c
index 55d9c8c..f65ccbd 100644
--- a/libavfilter/vf_codecview.c
+++ b/libavfilter/vf_codecview.c
@@ -216,9 +216,6 @@ static void draw_block_rectangle(uint8_t *buf, int sx, int sy, int w, int h, ptr
buf[sx + w - 1] = color;
buf += stride;
}
-
- for (int x = sx; x < sx + w; x++)
- buf[x] = color;
}
static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
--
2.40.0

View File

@@ -29,6 +29,7 @@ SRC_URI = " \
file://vulkan_fix_gcc14.patch \
file://CVE-2023-49502.patch \
file://CVE-2024-31578.patch \
file://CVE-2024-31582.patch \
"
SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968"