Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | |
| 3 | Backport patch to fix CVE-2015-6749 from: |
| 4 | |
| 5 | https://trac.xiph.org/ticket/2212 |
| 6 | |
| 7 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 8 | --- |
| 9 | From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001 |
| 10 | From: Mark Harris <mark.hsj@gmail.com> |
| 11 | Date: Sun, 30 Aug 2015 05:54:46 -0700 |
| 12 | Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input |
| 13 | |
| 14 | Fixes #2212 |
| 15 | --- |
| 16 | oggenc/audio.c | 10 +++++----- |
| 17 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 18 | |
| 19 | diff --git a/oggenc/audio.c b/oggenc/audio.c |
| 20 | index 477da8c..4921fb9 100644 |
| 21 | --- a/oggenc/audio.c |
| 22 | +++ b/oggenc/audio.c |
| 23 | @@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] = |
| 24 | int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) |
| 25 | { |
| 26 | int aifc; /* AIFC or AIFF? */ |
| 27 | - unsigned int len; |
| 28 | - unsigned char *buffer; |
| 29 | + unsigned int len, readlen; |
| 30 | + unsigned char buffer[22]; |
| 31 | unsigned char buf2[8]; |
| 32 | aiff_fmt format; |
| 33 | aifffile *aiff = malloc(sizeof(aifffile)); |
| 34 | @@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) |
| 35 | return 0; /* Weird common chunk */ |
| 36 | } |
| 37 | |
| 38 | - buffer = alloca(len); |
| 39 | - |
| 40 | - if(fread(buffer,1,len,in) < len) |
| 41 | + readlen = len < sizeof(buffer) ? len : sizeof(buffer); |
| 42 | + if(fread(buffer,1,readlen,in) < readlen || |
| 43 | + (len > readlen && !seek_forward(in, len-readlen))) |
| 44 | { |
| 45 | fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); |
| 46 | return 0; |
| 47 | -- |
| 48 | 2.5.0 |
| 49 | |