67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
From b637e14f849130449544c8899aed716a2f049b75 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
Date: Mon, 10 Jun 2019 08:57:11 -0700
|
|
Subject: [PATCH 06/11] CVE-2019-7572: Fix a buffer overwrite in
|
|
IMA_ADPCM_decode If data chunk was longer than expected based on a WAV format
|
|
definition, IMA_ADPCM_decode() tried to write past the output buffer. This
|
|
patch fixes it.
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Based on patch from
|
|
<https://bugzilla.libsdl.org/show_bug.cgi?id=4496>.
|
|
|
|
CVE-2019-7572
|
|
https://bugzilla.libsdl.org/show_bug.cgi?id=4495
|
|
|
|
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
|
--HG--
|
|
branch : SDL-1.2
|
|
---
|
|
src/audio/SDL_wave.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
|
|
index 3eedd20a1..4159eb710 100644
|
|
--- a/src/audio/SDL_wave.c
|
|
+++ b/src/audio/SDL_wave.c
|
|
@@ -346,7 +346,7 @@ static void Fill_IMA_ADPCM_block(Uint8 *decoded, Uint8 *encoded,
|
|
static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
|
|
{
|
|
struct IMA_ADPCM_decodestate *state;
|
|
- Uint8 *freeable, *encoded, *encoded_end, *decoded;
|
|
+ Uint8 *freeable, *encoded, *encoded_end, *decoded, *decoded_end;
|
|
Sint32 encoded_len, samplesleft;
|
|
unsigned int c, channels;
|
|
|
|
@@ -373,6 +373,7 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
|
|
return(-1);
|
|
}
|
|
decoded = *audio_buf;
|
|
+ decoded_end = decoded + *audio_len;
|
|
|
|
/* Get ready... Go! */
|
|
while ( encoded_len >= IMA_ADPCM_state.wavefmt.blockalign ) {
|
|
@@ -392,6 +393,7 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
|
|
}
|
|
|
|
/* Store the initial sample we start with */
|
|
+ if (decoded + 2 > decoded_end) goto invalid_size;
|
|
decoded[0] = (Uint8)(state[c].sample&0xFF);
|
|
decoded[1] = (Uint8)(state[c].sample>>8);
|
|
decoded += 2;
|
|
@@ -402,6 +404,8 @@ static int IMA_ADPCM_decode(Uint8 **audio_buf, Uint32 *audio_len)
|
|
while ( samplesleft > 0 ) {
|
|
for ( c=0; c<channels; ++c ) {
|
|
if (encoded + 4 > encoded_end) goto invalid_size;
|
|
+ if (decoded + 4 * 4 * channels > decoded_end)
|
|
+ goto invalid_size;
|
|
Fill_IMA_ADPCM_block(decoded, encoded,
|
|
c, channels, &state[c]);
|
|
encoded += 4;
|
|
--
|
|
2.21.0
|
|
|