summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authornikhil <nikhilar2410@gmail.com>2023-06-07 10:53:16 +0530
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-13 22:10:32 +0100
commit61db2b4796a2ac196ffb2967aa1f1029bf0d7a2c (patch)
tree8c656dbfceee36c72a739386919d2a7bd8c1874b /meta/recipes-multimedia
parent7ff2e05a5b5c82fd81d6411f3285b22484896ace (diff)
downloadpoky-61db2b4796a2ac196ffb2967aa1f1029bf0d7a2c.tar.gz
libwebp: Fix CVE-2023-1999
Add patch to fix CVE-2023-1999 Link: https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129 (From OE-Core rev: 8f6fcbe2d64e998be934b5b2e0ab65c159bfb807) Signed-off-by: Nikhil R <nikhil.r@kpit.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/webp/files/CVE-2023-1999.patch55
-rw-r--r--meta/recipes-multimedia/webp/libwebp_1.3.0.bb4
2 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch b/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch
new file mode 100644
index 0000000000..d293ab93ab
--- /dev/null
+++ b/meta/recipes-multimedia/webp/files/CVE-2023-1999.patch
@@ -0,0 +1,55 @@
1From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001
2From: James Zern <jzern@google.com>
3Date: Wed, 22 Feb 2023 22:15:47 -0800
4Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error
5
6This avoids a double free should the function fail prior to
7VP8BitWriterInit() and a previous trial result's buffer carried over.
8Previously in ApplyFiltersAndEncode() trial.bw (with a previous
9iteration's buffer) would be freed, followed by best.bw pointing to the
10same buffer.
11
12Since:
13187d379d add a fallback to ALPHA_NO_COMPRESSION
14
15In addition, check the return value of VP8BitWriterInit() in this
16function.
17
18Bug: webp:603
19Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910
20
21CVE: CVE-2023-1999
22Upstream-Status: Backport [https://github.com/webmproject/libwebp/commit/a486d800b60d0af4cc0836bf7ed8f21e12974129]
23Signed-off-by: Nikhil R <nikhil.r@kpit.com>
24---
25 src/enc/alpha_enc.c | 4 +++-
26 1 file changed, 3 insertions(+), 1 deletion(-)
27
28diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c
29index f7c02690e3..7d205586fe 100644
30--- a/src/enc/alpha_enc.c
31+++ b/src/enc/alpha_enc.c
32@@ -13,6 +13,7 @@
33
34 #include <assert.h>
35 #include <stdlib.h>
36+#include <string.h>
37
38 #include "src/enc/vp8i_enc.h"
39 #include "src/dsp/dsp.h"
40@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
41 }
42 } else {
43 VP8LBitWriterWipeOut(&tmp_bw);
44+ memset(&result->bw, 0, sizeof(result->bw));
45 return 0;
46 }
47 }
48@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height,
49 header = method | (filter << 2);
50 if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4;
51
52- VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size);
53+ if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0;
54 ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN);
55 ok = ok && VP8BitWriterAppend(&result->bw, output, output_size);
diff --git a/meta/recipes-multimedia/webp/libwebp_1.3.0.bb b/meta/recipes-multimedia/webp/libwebp_1.3.0.bb
index 6939cd33a5..7ca67e44fb 100644
--- a/meta/recipes-multimedia/webp/libwebp_1.3.0.bb
+++ b/meta/recipes-multimedia/webp/libwebp_1.3.0.bb
@@ -18,6 +18,10 @@ SRC_URI[sha256sum] = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431
18 18
19UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html" 19UPSTREAM_CHECK_URI = "http://downloads.webmproject.org/releases/webp/index.html"
20 20
21SRC_URI += " \
22 file://CVE-2023-1999.patch \
23"
24
21EXTRA_OECONF = " \ 25EXTRA_OECONF = " \
22 --disable-wic \ 26 --disable-wic \
23 --enable-libwebpmux \ 27 --enable-libwebpmux \