1*4882a593Smuzhiyun# HG changeset patch 2*4882a593Smuzhiyun# User Petr Písař <ppisar@redhat.com> 3*4882a593Smuzhiyun# Date 1560042129 25200 4*4882a593Smuzhiyun# Sat Jun 08 18:02:09 2019 -0700 5*4882a593Smuzhiyun# Branch SDL-1.2 6*4882a593Smuzhiyun# Node ID 388987dff7bf8f1e214e69c2e4f1aa31e06396b5 7*4882a593Smuzhiyun# Parent e52413f5258600878f9a10d2f92605a729aa8976 8*4882a593SmuzhiyunCVE-2019-7578: Fix a buffer overread in InitIMA_ADPCM 9*4882a593SmuzhiyunIf IMA ADPCM format chunk was too short, InitIMA_ADPCM() parsing it 10*4882a593Smuzhiyuncould read past the end of chunk data. This patch fixes it. 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunCVE-2019-7578 13*4882a593Smuzhiyunhttps://bugzilla.libsdl.org/show_bug.cgi?id=4494 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Petr Písař <ppisar@redhat.com> 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunCVE: CVE-2019-7578 18*4882a593SmuzhiyunUpstream-Status: Backport 19*4882a593SmuzhiyunSigned-off-by: Anuj Mittal <anuj.mittal@intel.com> 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff -r e52413f52586 -r 388987dff7bf src/audio/SDL_wave.c 22*4882a593Smuzhiyun--- a/src/audio/SDL_wave.c Sat Jun 08 17:57:43 2019 -0700 23*4882a593Smuzhiyun+++ b/src/audio/SDL_wave.c Sat Jun 08 18:02:09 2019 -0700 24*4882a593Smuzhiyun@@ -222,11 +222,12 @@ 25*4882a593Smuzhiyun struct IMA_ADPCM_decodestate state[2]; 26*4882a593Smuzhiyun } IMA_ADPCM_state; 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun-static int InitIMA_ADPCM(WaveFMT *format) 29*4882a593Smuzhiyun+static int InitIMA_ADPCM(WaveFMT *format, int length) 30*4882a593Smuzhiyun { 31*4882a593Smuzhiyun- Uint8 *rogue_feel; 32*4882a593Smuzhiyun+ Uint8 *rogue_feel, *rogue_feel_end; 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun /* Set the rogue pointer to the IMA_ADPCM specific data */ 35*4882a593Smuzhiyun+ if (length < sizeof(*format)) goto too_short; 36*4882a593Smuzhiyun IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding); 37*4882a593Smuzhiyun IMA_ADPCM_state.wavefmt.channels = SDL_SwapLE16(format->channels); 38*4882a593Smuzhiyun IMA_ADPCM_state.wavefmt.frequency = SDL_SwapLE32(format->frequency); 39*4882a593Smuzhiyun@@ -235,11 +236,16 @@ 40*4882a593Smuzhiyun IMA_ADPCM_state.wavefmt.bitspersample = 41*4882a593Smuzhiyun SDL_SwapLE16(format->bitspersample); 42*4882a593Smuzhiyun rogue_feel = (Uint8 *)format+sizeof(*format); 43*4882a593Smuzhiyun+ rogue_feel_end = (Uint8 *)format + length; 44*4882a593Smuzhiyun if ( sizeof(*format) == 16 ) { 45*4882a593Smuzhiyun rogue_feel += sizeof(Uint16); 46*4882a593Smuzhiyun } 47*4882a593Smuzhiyun+ if (rogue_feel + 2 > rogue_feel_end) goto too_short; 48*4882a593Smuzhiyun IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1]<<8)|rogue_feel[0]); 49*4882a593Smuzhiyun return(0); 50*4882a593Smuzhiyun+too_short: 51*4882a593Smuzhiyun+ SDL_SetError("Unexpected length of a chunk with an IMA ADPCM format"); 52*4882a593Smuzhiyun+ return(-1); 53*4882a593Smuzhiyun } 54*4882a593Smuzhiyun 55*4882a593Smuzhiyun static Sint32 IMA_ADPCM_nibble(struct IMA_ADPCM_decodestate *state,Uint8 nybble) 56*4882a593Smuzhiyun@@ -471,7 +477,7 @@ 57*4882a593Smuzhiyun break; 58*4882a593Smuzhiyun case IMA_ADPCM_CODE: 59*4882a593Smuzhiyun /* Try to understand this */ 60*4882a593Smuzhiyun- if ( InitIMA_ADPCM(format) < 0 ) { 61*4882a593Smuzhiyun+ if ( InitIMA_ADPCM(format, lenread) < 0 ) { 62*4882a593Smuzhiyun was_error = 1; 63*4882a593Smuzhiyun goto done; 64*4882a593Smuzhiyun } 65