diff --git a/libwebp-double-free.patch b/libwebp-double-free.patch new file mode 100644 index 0000000..49d2647 --- /dev/null +++ b/libwebp-double-free.patch @@ -0,0 +1,52 @@ +From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001 +From: James Zern +Date: Wed, 22 Feb 2023 22:15:47 -0800 +Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error + +This avoids a double free should the function fail prior to +VP8BitWriterInit() and a previous trial result's buffer carried over. +Previously in ApplyFiltersAndEncode() trial.bw (with a previous +iteration's buffer) would be freed, followed by best.bw pointing to the +same buffer. + +Since: +187d379d add a fallback to ALPHA_NO_COMPRESSION + +In addition, check the return value of VP8BitWriterInit() in this +function. + +Bug: webp:603 +Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910 +--- + src/enc/alpha_enc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c +index f7c02690e3..7d205586fe 100644 +--- a/src/enc/alpha_enc.c ++++ b/src/enc/alpha_enc.c +@@ -13,6 +13,7 @@ + + #include + #include ++#include + + #include "src/enc/vp8i_enc.h" + #include "src/dsp/dsp.h" +@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + } + } else { + VP8LBitWriterWipeOut(&tmp_bw); ++ memset(&result->bw, 0, sizeof(result->bw)); + return 0; + } + } +@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, + header = method | (filter << 2); + if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4; + +- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size); ++ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0; + ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN); + ok = ok && VP8BitWriterAppend(&result->bw, output, output_size); + diff --git a/libwebp.changes b/libwebp.changes index 2beda0f..38c7283 100644 --- a/libwebp.changes +++ b/libwebp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 30 01:20:57 UTC 2023 - Xiaoguang Wang + +- Add libwebp-double-free.patch: Avoid a double free, upstream + commit a486d800 (bsc#1210212 CVE-2023-1999). + ------------------------------------------------------------------- Thu May 4 07:46:40 UTC 2023 - Arjen de Korte diff --git a/libwebp.spec b/libwebp.spec index cac24fd..57efd9d 100644 --- a/libwebp.spec +++ b/libwebp.spec @@ -1,7 +1,7 @@ # # spec file for package libwebp # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,10 @@ Source: https://storage.googleapis.com/downloads.webmproject.org/release Source2: https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%version.tar.gz.asc Source3: %name.keyring Source4: baselibs.conf + +# PATCH-FIX-UPSTREAM libwebp-double-free.patch bsc#1210212 CVE-2023-1999 xwang@suse.com -- Avoid a double free +Patch0: libwebp-double-free.patch + BuildRequires: giflib-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(glut) @@ -118,11 +122,11 @@ common imports - WebPImportGray/WebPImportRGB565/WebPImportRGB4444. %package devel Summary: Development files for libwebp, a library for the WebP format Group: Development/Libraries/C and C++ +Requires: libsharpyuv0 = %version Requires: libwebp7 = %version Requires: libwebpdecoder3 = %version Requires: libwebpdemux2 = %version Requires: libwebpmux3 = %version -Requires: libsharpyuv0 = %version %if %{with extras} Requires: libwebpextras0 = %version %endif