From: Bhavesh R Maheshwari <[email protected]> Pick the patch from [1], also referenced in the NVD report [2].
[1] https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/1836ef96846937a6cc2443698a693104f5c0b21e [2] https://nvd.nist.gov/vuln/detail/CVE-2026-64835 Signed-off-by: Bhavesh R Maheshwari <[email protected]> Signed-off-by: Yoann Congal <[email protected]> --- .../ffmpeg/ffmpeg/CVE-2026-64835.patch | 45 +++++++++++++++++++ .../recipes-multimedia/ffmpeg/ffmpeg_8.0.3.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2026-64835.patch diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2026-64835.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2026-64835.patch new file mode 100644 index 00000000000..735bd1176f0 --- /dev/null +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2026-64835.patch @@ -0,0 +1,45 @@ +From 99c7dfd80d63bf009a102d3278a9f98b2fe68002 Mon Sep 17 00:00:00 2001 +From: Pavel Kohout <[email protected]> +Date: Mon, 29 Jun 2026 23:46:16 +0200 +Subject: [PATCH 4/9] avcodec/adx: sync decoder channel state on NEW_EXTRADATA + +Fixes: out of array access +Fixes: heaNtmHvklpe +Fixes: 92396cee602320c714713ca2d93b53684ad57000 (avformat: add CRI AAX demuxer) +Found-by: Pavel Kohout (Aisle Research) +Signed-off-by: Michael Niedermayer <[email protected]> + +CVE: CVE-2026-64835 +Upstream-Status: Backport [https://code.ffmpeg.org/FFmpeg/FFmpeg/commit/1836ef96846937a6cc2443698a693104f5c0b21e] + +Signed-off-by: Bhavesh R Maheshwari <[email protected]> +--- + libavcodec/adxdec.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c +index 21be6fe..10fd81d 100644 +--- a/libavcodec/adxdec.c ++++ b/libavcodec/adxdec.c +@@ -172,6 +172,7 @@ static int adx_decode_frame(AVCodecContext *avctx, AVFrame *frame, + new_extradata = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, + &new_extradata_size); + if (new_extradata && new_extradata_size > 0) { ++ int old_channels = c->channels; + int header_size; + if ((ret = adx_decode_header(avctx, new_extradata, + new_extradata_size, &header_size, +@@ -180,6 +181,10 @@ static int adx_decode_frame(AVCodecContext *avctx, AVFrame *frame, + return AVERROR_INVALIDDATA; + } + ++ c->channels = avctx->ch_layout.nb_channels; ++ c->header_parsed = 1; ++ if (old_channels != c->channels) ++ memset(c->prev, 0, sizeof(c->prev)); + c->eof = 0; + } + +-- +2.43.0 + diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.3.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.3.bb index c00c3f32b78..8d3b0dd79e0 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.3.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_8.0.3.bb @@ -31,6 +31,7 @@ SRC_URI = "https://www.ffmpeg.org/releases/${BP}.tar.xz \ file://CVE-2026-64832.patch \ file://CVE-2026-64833.patch \ file://CVE-2026-64834.patch \ + file://CVE-2026-64835.patch \ " SRC_URI[sha256sum] = "6136812ea6d4e68bdba27e33c2a94382711cdf4f8602ffef056ff792bd6f9818"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#246169): https://lists.openembedded.org/g/openembedded-core/message/246169 Mute This Topic: https://lists.openembedded.org/mt/121305658/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
