Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libwebp for openSUSE:Factory checked in at 2023-06-22 23:24:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwebp (Old) and /work/SRC/openSUSE:Factory/.libwebp.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwebp" Thu Jun 22 23:24:36 2023 rev:35 rq:1094342 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libwebp/libwebp.changes 2023-05-05 15:56:49.907929303 +0200 +++ /work/SRC/openSUSE:Factory/.libwebp.new.15902/libwebp.changes 2023-06-22 23:24:39.109711811 +0200 @@ -1,0 +2,6 @@ +Tue May 30 01:20:57 UTC 2023 - Xiaoguang Wang <xiaoguang.w...@suse.com> + +- Add libwebp-double-free.patch: Avoid a double free, upstream + commit a486d800 (bsc#1210212 CVE-2023-1999). + +------------------------------------------------------------------- New: ---- libwebp-double-free.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwebp.spec ++++++ --- /var/tmp/diff_new_pack.xyAGAJ/_old 2023-06-22 23:24:41.293706268 +0200 +++ /var/tmp/diff_new_pack.xyAGAJ/_new 2023-06-22 23:24:41.297706258 +0200 @@ -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 @@ 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 xw...@suse.com -- Avoid a double free +Patch0: libwebp-double-free.patch + BuildRequires: giflib-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(glut) @@ -118,11 +122,11 @@ %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 ++++++ libwebp-double-free.patch ++++++ >From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001 From: James Zern <jz...@google.com> 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 <assert.h> #include <stdlib.h> +#include <string.h> #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);
