diff options
| author | Ankur Tyagi <ankur.tyagi85@gmail.com> | 2025-12-16 12:48:40 +0530 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@oss.qualcomm.com> | 2025-12-17 11:45:24 +0530 |
| commit | 9a4ed6f20f5959a1019f76d43989d1959261f520 (patch) | |
| tree | 1fa9cd8510f4a1ae5219a6b66787ac53fff3fa70 /meta-multimedia/recipes-multimedia | |
| parent | 86abe3d5dec4ef20081fa26850574a3375966d28 (diff) | |
| download | meta-openembedded-9a4ed6f20f5959a1019f76d43989d1959261f520.tar.gz | |
openh264: patch CVE-2025-27091
Details https://nvd.nist.gov/vuln/detail/CVE-2025-27091
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/openh264/openh264/CVE-2025-27091.patch | 28 | ||||
| -rw-r--r-- | meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264/CVE-2025-27091.patch b/meta-multimedia/recipes-multimedia/openh264/openh264/CVE-2025-27091.patch new file mode 100644 index 0000000000..fc7ccceec7 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/openh264/openh264/CVE-2025-27091.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 09672b2fe25ca0ca6537412eb835209b6c7c791b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: BenzhengZhang <140143892+BenzhengZhang@users.noreply.github.com> | ||
| 3 | Date: Thu, 19 Dec 2024 17:12:42 +0800 | ||
| 4 | Subject: [PATCH] Potential bug fix (#3818) | ||
| 5 | |||
| 6 | CVE: CVE-2025-27091 | ||
| 7 | Upstream-Status: Backport [https://github.com/cisco/openh264/commit/63db555e30986e3a5f07871368dc90ae78c27449] | ||
| 8 | (cherry picked from commit 63db555e30986e3a5f07871368dc90ae78c27449) | ||
| 9 | Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com> | ||
| 10 | --- | ||
| 11 | codec/decoder/core/src/decoder.cpp | 4 ++++ | ||
| 12 | 1 file changed, 4 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/codec/decoder/core/src/decoder.cpp b/codec/decoder/core/src/decoder.cpp | ||
| 15 | index dba6711b..c639cf7c 100644 | ||
| 16 | --- a/codec/decoder/core/src/decoder.cpp | ||
| 17 | +++ b/codec/decoder/core/src/decoder.cpp | ||
| 18 | @@ -848,6 +848,10 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in | ||
| 19 | return pCtx->iErrorCode; | ||
| 20 | } | ||
| 21 | |||
| 22 | + if (pCtx->iErrorCode != ERR_NONE && !(pCtx->iErrorCode & dsDataErrorConcealed)) { | ||
| 23 | + return pCtx->iErrorCode; | ||
| 24 | + } | ||
| 25 | + | ||
| 26 | pDstNal += (iDstIdx + 4); //init, increase 4 reserved zero bytes, used to store the next NAL | ||
| 27 | if ((iSrcLength - iSrcConsumed + 4) > (pRawData->pEnd - pDstNal)) { | ||
| 28 | pDstNal = pRawData->pCurPos = pRawData->pHead; | ||
diff --git a/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb b/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb index 6dfd759355..f0fe4f874f 100644 --- a/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb +++ b/meta-multimedia/recipes-multimedia/openh264/openh264_2.3.1.bb | |||
| @@ -17,6 +17,7 @@ BRANCH = "openh264v${PV}" | |||
| 17 | SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ | 17 | SRC_URI = "git://github.com/cisco/openh264.git;protocol=https;branch=${BRANCH} \ |
| 18 | file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ | 18 | file://0001-Makefile-Use-cp-options-to-preserve-file-mode.patch \ |
| 19 | file://0002-Makefile-add-possibility-to-disable-NEON-extension.patch \ | 19 | file://0002-Makefile-add-possibility-to-disable-NEON-extension.patch \ |
| 20 | file://CVE-2025-27091.patch \ | ||
| 20 | " | 21 | " |
| 21 | 22 | ||
| 22 | COMPATIBLE_MACHINE:armv7a = "(.*)" | 23 | COMPATIBLE_MACHINE:armv7a = "(.*)" |
