From f735ea20b176591b65deaa456e93ebf7ecbead3f Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Mon, 20 Apr 2026 08:27:43 +0200 Subject: [PATCH] libgphoto2: patch CVE-2026-40335 Details: https://nvd.nist.gov/vuln/detail/CVE-2026-40335 Backport the patch that is referenced by the NVD advisory. Signed-off-by: Gyorgy Sarvari Signed-off-by: Khem Raj --- .../gphoto2/libgphoto2/CVE-2026-40335.patch | 43 +++++++++++++++++++ .../gphoto2/libgphoto2_2.5.33.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40335.patch diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40335.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40335.patch new file mode 100644 index 0000000000..dfe832e6c8 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/CVE-2026-40335.patch @@ -0,0 +1,43 @@ +From edcdf804662eb4340fdc371af4853d6579e969ab Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Wed, 8 Apr 2026 15:07:38 +0200 +Subject: [PATCH] =?UTF-8?q?Fixed=20UINT128/INT128=20Unchecked=20Offset=20A?= + =?UTF-8?q?dvance=20(CWE-125)=20=E2=80=94=20MEDIUM?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Finding 5: UINT128/INT128 Unchecked Offset Advance (CWE-125) — MEDIUM + +In ptp_unpack_DPV(), the PTP_DTC_UINT128 and PTP_DTC_INT128 cases advance *offset += 16 without verifying 16 bytes remain. The entry check at line 609 only guarantees *offset < total (at least 1 byte available). After the unchecked advance, *offset can exceed total, and the CTVAL macro's bounds check (total - *offset < sizeof(target)) wraps due to unsigned arithmetic. + +CVE-2026-40335 + +Reported-By: Sebastián Alba + +CVE: CVE-2026-40335 +Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/433bde9888d70aa726e32744cd751d7dbe94379a] +Signed-off-by: Gyorgy Sarvari +--- + camlibs/ptp2/ptp-pack.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c +index 982b4f4..7fc120d 100644 +--- a/camlibs/ptp2/ptp-pack.c ++++ b/camlibs/ptp2/ptp-pack.c +@@ -614,10 +614,14 @@ ptp_unpack_DPV ( + case PTP_DTC_UINT64: CTVAL(value->u64,dtoh64a); break; + + case PTP_DTC_UINT128: ++ if (total - *offset < 16) ++ return 0; + *offset += 16; + /*fprintf(stderr,"unhandled unpack of uint128n");*/ + break; + case PTP_DTC_INT128: ++ if (total - *offset < 16) ++ return 0; + *offset += 16; + /*fprintf(stderr,"unhandled unpack of int128n");*/ + break; diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb index e8e56171a1..269731731b 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.33.bb @@ -15,6 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/${BP}.tar.xz;name=libgphoto2 \ file://0001-libgphoto2-fix-const-correctness-for-c23-builds.patch \ file://CVE-2026-40333.patch \ file://CVE-2026-40334.patch \ + file://CVE-2026-40335.patch \ " SRC_URI[libgphoto2.sha256sum] = "28825f767a85544cb58f6e15028f8e53a5bb37a62148b3f1708b524781c3bef2"