diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2022-11-22 11:21:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-01 19:35:04 +0000 |
commit | c505f3539d34c7527c00f1c9d93fed2c2d17bb27 (patch) | |
tree | fcce4dd16310c3480fc8b25e80f3237c8f0f23d3 /meta/recipes-multimedia | |
parent | 7a5685ad740f81e16bd92eb8196bdb4b5d41fd24 (diff) | |
download | poky-c505f3539d34c7527c00f1c9d93fed2c2d17bb27.tar.gz |
libsndfile1: Backport fix for CVE-2021-4156
CVE: CVE-2021-4156
(From OE-Core rev: 174e79299d815f0a7dbef0668dc488ce10e89d3d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/libsndfile/libsndfile1/0001-flac-Fix-improper-buffer-reusing-732.patch | 29 | ||||
-rw-r--r-- | meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1/0001-flac-Fix-improper-buffer-reusing-732.patch b/meta/recipes-multimedia/libsndfile/libsndfile1/0001-flac-Fix-improper-buffer-reusing-732.patch new file mode 100644 index 0000000000..ede696180a --- /dev/null +++ b/meta/recipes-multimedia/libsndfile/libsndfile1/0001-flac-Fix-improper-buffer-reusing-732.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 9e4e9224c39195bde8ec14d1295944f713adb79a Mon Sep 17 00:00:00 2001 | ||
2 | From: yuan <ssspeed00@gmail.com> | ||
3 | Date: Tue, 20 Apr 2021 16:16:32 +0800 | ||
4 | Subject: [PATCH] flac: Fix improper buffer reusing (#732) | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/libsndfile/libsndfile/commit/ced91d7b971be6173b604154c39279ce90ad87cc] | ||
7 | CVE: CVE-2021-4156 | ||
8 | |||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
10 | --- | ||
11 | src/flac.c | 4 ++++ | ||
12 | 1 file changed, 4 insertions(+) | ||
13 | |||
14 | diff --git a/src/flac.c b/src/flac.c | ||
15 | index 64d0172e..e3320450 100644 | ||
16 | --- a/src/flac.c | ||
17 | +++ b/src/flac.c | ||
18 | @@ -948,7 +948,11 @@ flac_read_loop (SF_PRIVATE *psf, unsigned len) | ||
19 | /* Decode some more. */ | ||
20 | while (pflac->pos < pflac->len) | ||
21 | { if (FLAC__stream_decoder_process_single (pflac->fsd) == 0) | ||
22 | + { psf_log_printf (psf, "FLAC__stream_decoder_process_single returned false\n") ; | ||
23 | + /* Current frame is busted, so NULL the pointer. */ | ||
24 | + pflac->frame = NULL ; | ||
25 | break ; | ||
26 | + } ; | ||
27 | state = FLAC__stream_decoder_get_state (pflac->fsd) ; | ||
28 | if (state >= FLAC__STREAM_DECODER_END_OF_STREAM) | ||
29 | { psf_log_printf (psf, "FLAC__stream_decoder_get_state returned %s\n", FLAC__StreamDecoderStateString [state]) ; | ||
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb index ea14fe29cb..f6ea585e34 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb | |||
@@ -10,6 +10,7 @@ LICENSE = "LGPL-2.1-only" | |||
10 | 10 | ||
11 | SRC_URI = "https://github.com/libsndfile/libsndfile/releases/download/${PV}/libsndfile-${PV}.tar.bz2 \ | 11 | SRC_URI = "https://github.com/libsndfile/libsndfile/releases/download/${PV}/libsndfile-${PV}.tar.bz2 \ |
12 | file://noopus.patch \ | 12 | file://noopus.patch \ |
13 | file://0001-flac-Fix-improper-buffer-reusing-732.patch \ | ||
13 | " | 14 | " |
14 | UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsndfile/releases/" | 15 | UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsndfile/releases/" |
15 | 16 | ||