From c86bcacd17232348e0512fb41641727672a937498f02e4c49521af7bd7c530b9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 25 Apr 2024 21:44:57 +0000 Subject: [PATCH] Move metadata into patch/use established git patch line tags as far as doable OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=214 --- ffmpeg-CVE-2023-49502.patch | 37 +++++++++++++++++++------------------ ffmpeg-CVE-2023-51793.patch | 19 ++++++++++--------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/ffmpeg-CVE-2023-49502.patch b/ffmpeg-CVE-2023-49502.patch index 2937842..95a0423 100644 --- a/ffmpeg-CVE-2023-49502.patch +++ b/ffmpeg-CVE-2023-49502.patch @@ -1,22 +1,23 @@ -commit 737ede405b11a37fdd61d19cf25df296a0cb0b75 -Author: Cosmin Stejerean -Date: Wed Dec 6 18:39:32 2023 +0800 +From 737ede405b11a37fdd61d19cf25df296a0cb0b75 +From: Cosmin Stejerean +Date: Wed Dec 6 18:39:32 2023 +0800 +Subject: avfilter/bwdif: account for chroma sub-sampling in min size calculation +References: https://bugzilla.opensuse.org/1223235 +References: CVE-2023-49502 - avfilter/bwdif: account for chroma sub-sampling in min size calculation - - The current logic for detecting frames that are too small for the - algorithm does not account for chroma sub-sampling, and so a sample - where the luma plane is large enough, but the chroma planes are not - will not be rejected. In that event, a heap overflow will occur. - - This change adjusts the logic to consider the chroma planes and makes - the change to all three bwdif implementations. - - Fixes #10688 - - Signed-off-by: Cosmin Stejerean - Reviewed-by: Thomas Mundt - Signed-off-by: Philip Langdale +The current logic for detecting frames that are too small for the +algorithm does not account for chroma sub-sampling, and so a sample +where the luma plane is large enough, but the chroma planes are not +will not be rejected. In that event, a heap overflow will occur. + +This change adjusts the logic to consider the chroma planes and makes +the change to all three bwdif implementations. + +Fixes #10688 + +Signed-off-by: Cosmin Stejerean +Reviewed-by: Thomas Mundt +Signed-off-by: Philip Langdale diff -Nura ffmpeg-4.4.4/libavfilter/vf_bwdif.c ffmpeg-4.4.4_new/libavfilter/vf_bwdif.c --- ffmpeg-4.4.4/libavfilter/vf_bwdif.c 2023-04-13 02:01:50.000000000 +0800 diff --git a/ffmpeg-CVE-2023-51793.patch b/ffmpeg-CVE-2023-51793.patch index ebdb422..d61dff6 100644 --- a/ffmpeg-CVE-2023-51793.patch +++ b/ffmpeg-CVE-2023-51793.patch @@ -1,14 +1,15 @@ -commit 0ecc1f0e48930723d7a467761b66850811c23e62 -Author: Michael Niedermayer -Date: Fri Dec 22 12:31:35 2023 +0100 - - avfilter/vf_weave: Fix odd height handling +From 0ecc1f0e48930723d7a467761b66850811c23e62 +From: Michael Niedermayer +Date: Fri Dec 22 12:31:35 2023 +0100 +Subject: avfilter/vf_weave: Fix odd height handling +References: https://bugzilla.opensuse.org/1223272 +References: CVE-2023-51793 - Fixes: out of array access - Fixes: tickets/10743/poc10ffmpeg +Fixes: out of array access +Fixes: tickets/10743/poc10ffmpeg - Found-by: Zeng Yunxiang and Li Zeyuan - Signed-off-by: Michael Niedermayer +Found-by: Zeng Yunxiang and Li Zeyuan +Signed-off-by: Michael Niedermayer diff -Nura ffmpeg-4.4.4/libavfilter/vf_weave.c ffmpeg-4.4.4_new/libavfilter/vf_weave.c --- ffmpeg-4.4.4/libavfilter/vf_weave.c 2023-04-13 02:01:50.000000000 +0800