From d6ab433e466bac06b63a196a6bd8ab2ce0373528 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Sep 2023 13:51:39 +0200 Subject: [PATCH] package/libraw: fix CVE-2023-1729 A flaw was found in LibRaw. A heap-buffer-overflow in raw2image_ex() caused by a maliciously crafted file may lead to an application crash. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit bc4110b0739f07436cb8c0ff837b7284835fb9b8) Signed-off-by: Peter Korsgaard --- ...shrink-flag-for-3-4-component-images.patch | 24 +++++++++++++++++++ package/libraw/libraw.mk | 3 +++ 2 files changed, 27 insertions(+) create mode 100644 package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch diff --git a/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch b/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch new file mode 100644 index 0000000000..ef93e0901b --- /dev/null +++ b/package/libraw/0001-do-not-set-shrink-flag-for-3-4-component-images.patch @@ -0,0 +1,24 @@ +From 477e0719ffc07190c89b4f3d12d51b1292e75828 Mon Sep 17 00:00:00 2001 +From: Alex Tutubalin +Date: Sat, 14 Jan 2023 18:32:59 +0300 +Subject: [PATCH] do not set shrink flag for 3/4 component images + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/LibRaw/LibRaw/commit/477e0719ffc07190c89b4f3d12d51b1292e75828 +--- + src/preprocessing/raw2image.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp +index e65e2ad7..702cf290 100644 +--- a/src/preprocessing/raw2image.cpp ++++ b/src/preprocessing/raw2image.cpp +@@ -43,6 +43,8 @@ void LibRaw::raw2image_start() + + // adjust for half mode! + IO.shrink = ++ !imgdata.rawdata.color4_image && !imgdata.rawdata.color3_image && ++ !imgdata.rawdata.float4_image && !imgdata.rawdata.float3_image && + P1.filters && + (O.half_size || ((O.threshold || O.aber[0] != 1 || O.aber[2] != 1))); + diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk index b6616f0c10..cbd509cfea 100644 --- a/package/libraw/libraw.mk +++ b/package/libraw/libraw.mk @@ -18,6 +18,9 @@ LIBRAW_DEPENDENCIES = host-pkgconf LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" +# 0001-do-not-set-shrink-flag-for-3-4-component-images.patch +LIBRAW_IGNORE_CVES += 0001-do-not-set-shrink-flag-for-3-4-component-images.patch + ifeq ($(BR2_PACKAGE_JASPER),y) LIBRAW_CONF_OPTS += --enable-jasper LIBRAW_DEPENDENCIES += jasper