diff options
author | Vijay Anusuri <vanusuri@mvista.com> | 2023-12-19 09:45:43 +0530 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-12-29 05:29:13 -1000 |
commit | 3433d043c7ecd8368400be5dcc3a9705b237dd57 (patch) | |
tree | dc87ab560c08ee6f8dd82b3bcccdf38f681894be /meta/recipes-multimedia/flac/files/CVE-2021-0561.patch | |
parent | 39aad83070524ce9941e132cff08a3b83824ebdc (diff) | |
download | poky-3433d043c7ecd8368400be5dcc3a9705b237dd57.tar.gz |
flac: Backport fix for CVE-2021-0561
Upstream-Status: Backport [https://github.com/xiph/flac/commit/e1575e4a7c5157cbf4e4a16dbd39b74f7174c7be]
(From OE-Core rev: 9b2cd2d5e0dac297b3a1779e6720e0ee2a3de168)
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-multimedia/flac/files/CVE-2021-0561.patch')
-rw-r--r-- | meta/recipes-multimedia/flac/files/CVE-2021-0561.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/flac/files/CVE-2021-0561.patch b/meta/recipes-multimedia/flac/files/CVE-2021-0561.patch new file mode 100644 index 0000000000..e19833a5ad --- /dev/null +++ b/meta/recipes-multimedia/flac/files/CVE-2021-0561.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From e1575e4a7c5157cbf4e4a16dbd39b74f7174c7be Mon Sep 17 00:00:00 2001 | ||
2 | From: Neelkamal Semwal <neelkamal.semwal@ittiam.com> | ||
3 | Date: Fri, 18 Dec 2020 22:28:36 +0530 | ||
4 | Subject: [PATCH] libFlac: Exit at EOS in verify mode | ||
5 | |||
6 | When verify mode is enabled, once decoder flags end of stream, | ||
7 | encode processing is considered complete. | ||
8 | |||
9 | CVE-2021-0561 | ||
10 | |||
11 | Signed-off-by: Ralph Giles <giles@thaumas.net> | ||
12 | |||
13 | Upstream-Status: Backport [https://github.com/xiph/flac/commit/e1575e4a7c5157cbf4e4a16dbd39b74f7174c7be] | ||
14 | CVE: CVE-2021-0561 | ||
15 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
16 | --- | ||
17 | src/libFLAC/stream_encoder.c | 4 +++- | ||
18 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c | ||
21 | index 4c91247fe8..7109802c27 100644 | ||
22 | --- a/src/libFLAC/stream_encoder.c | ||
23 | +++ b/src/libFLAC/stream_encoder.c | ||
24 | @@ -2610,7 +2610,9 @@ FLAC__bool write_bitbuffer_(FLAC__StreamEncoder *encoder, uint32_t samples, FLAC | ||
25 | encoder->private_->verify.needs_magic_hack = true; | ||
26 | } | ||
27 | else { | ||
28 | - if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder)) { | ||
29 | + if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder) | ||
30 | + || (!is_last_block | ||
31 | + && (FLAC__stream_encoder_get_verify_decoder_state(encoder) == FLAC__STREAM_DECODER_END_OF_STREAM))) { | ||
32 | FLAC__bitwriter_release_buffer(encoder->private_->frame); | ||
33 | FLAC__bitwriter_clear(encoder->private_->frame); | ||
34 | if(encoder->protected_->state != FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA) | ||