diff options
| author | Ankur Tyagi <ankur.tyagi85@gmail.com> | 2025-10-10 14:25:12 +1300 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2025-10-30 14:43:34 +0800 |
| commit | 7c56524a8d889a6d52ff0062dd534944497a2adc (patch) | |
| tree | 3c4441e1995e74088054a86b2e7c0f16cfdff688 /meta-oe | |
| parent | a8c196797610a2684eafd38864d71a1c0418b565 (diff) | |
| download | meta-openembedded-7c56524a8d889a6d52ff0062dd534944497a2adc.tar.gz | |
libraw: patch CVE-2025-43963
Details https://nvd.nist.gov/vuln/detail/CVE-2025-43963
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
(cherry picked from commit 287ed36b866adf46b0ec6245947da64531a98fa2)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/libraw/libraw/0002-CVE-2025-43963.patch | 40 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libraw/libraw_0.21.2.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libraw/libraw/0002-CVE-2025-43963.patch b/meta-oe/recipes-support/libraw/libraw/0002-CVE-2025-43963.patch new file mode 100644 index 0000000000..d571164781 --- /dev/null +++ b/meta-oe/recipes-support/libraw/libraw/0002-CVE-2025-43963.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From 975393c804bc321fd4bc709c3c221733dac2d80a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alex Tutubalin <lexa@lexa.ru> | ||
| 3 | Date: Thu, 6 Feb 2025 21:01:58 +0300 | ||
| 4 | Subject: [PATCH] CVE-2025-43963 | ||
| 5 | |||
| 6 | check split_col/split_row values in phase_one_correct | ||
| 7 | |||
| 8 | CVE: CVE-2025-43963 | ||
| 9 | Upstream-Status: Backport [https://github.com/LibRaw/LibRaw/commit/be26e7639ecf8beb55f124ce780e99842de2e964] | ||
| 10 | |||
| 11 | (cherry picked from commit be26e7639ecf8beb55f124ce780e99842de2e964) | ||
| 12 | Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com> | ||
| 13 | --- | ||
| 14 | src/decoders/load_mfbacks.cpp | 6 ++++-- | ||
| 15 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/src/decoders/load_mfbacks.cpp b/src/decoders/load_mfbacks.cpp | ||
| 18 | index 1a1bdfb3..f89aecce 100644 | ||
| 19 | --- a/src/decoders/load_mfbacks.cpp | ||
| 20 | +++ b/src/decoders/load_mfbacks.cpp | ||
| 21 | @@ -348,7 +348,8 @@ int LibRaw::phase_one_correct() | ||
| 22 | off_412 = ftell(ifp) - 38; | ||
| 23 | } | ||
| 24 | } | ||
| 25 | - else if (tag == 0x041f && !qlin_applied) | ||
| 26 | + else if (tag == 0x041f && !qlin_applied && ph1.split_col > 0 && ph1.split_col < raw_width | ||
| 27 | + && ph1.split_row > 0 && ph1.split_row < raw_height) | ||
| 28 | { /* Quadrant linearization */ | ||
| 29 | ushort lc[2][2][16], ref[16]; | ||
| 30 | int qr, qc; | ||
| 31 | @@ -432,7 +433,8 @@ int LibRaw::phase_one_correct() | ||
| 32 | } | ||
| 33 | qmult_applied = 1; | ||
| 34 | } | ||
| 35 | - else if (tag == 0x0431 && !qmult_applied) | ||
| 36 | + else if (tag == 0x0431 && !qmult_applied && ph1.split_col > 0 && ph1.split_col < raw_width | ||
| 37 | + && ph1.split_row > 0 && ph1.split_row < raw_height) | ||
| 38 | { /* Quadrant combined - four tile gain calibration */ | ||
| 39 | ushort lc[2][2][7], ref[7]; | ||
| 40 | int qr, qc; | ||
diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb index c6d9acb960..d4750630e0 100644 --- a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb +++ b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb | |||
| @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f" | |||
| 5 | SRC_URI = " \ | 5 | SRC_URI = " \ |
| 6 | git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https \ | 6 | git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https \ |
| 7 | file://0001-CVE-2025-43961-CVE-2025-43962.patch \ | 7 | file://0001-CVE-2025-43961-CVE-2025-43962.patch \ |
| 8 | file://0002-CVE-2025-43963.patch \ | ||
| 8 | " | 9 | " |
| 9 | SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d" | 10 | SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d" |
| 10 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
