|
 |
21f867 |
From 667ceb4aab60c1f74060143bb24e5f427b3cce5f Mon Sep 17 00:00:00 2001
|
|
|
21f867 |
From: Thomas Daede <daede003@umn.edu>
|
|
|
21f867 |
Date: Thu, 15 Mar 2018 14:15:31 -0700
|
|
|
21f867 |
Subject: [PATCH 3/3] CVE-2018-5146: Prevent out-of-bounds write in codebook
|
|
|
21f867 |
decoding.
|
|
|
21f867 |
|
|
|
21f867 |
Codebooks that are not an exact divisor of the partition size are now
|
|
|
21f867 |
truncated to fit within the partition.
|
|
|
21f867 |
---
|
|
|
21f867 |
lib/codebook.c | 48 ++++++++++--------------------------------------
|
|
|
21f867 |
1 file changed, 10 insertions(+), 38 deletions(-)
|
|
|
21f867 |
|
|
|
21f867 |
diff --git a/lib/codebook.c b/lib/codebook.c
|
|
|
21f867 |
index 321a28f..78672e2 100644
|
|
|
21f867 |
--- a/lib/codebook.c
|
|
|
21f867 |
+++ b/lib/codebook.c
|
|
|
21f867 |
@@ -386,7 +386,7 @@ long vorbis_book_decodevs_add(codebook *book,float *a,oggpack_buffer *b,int n){
|
|
|
21f867 |
t[i] = book->valuelist+entry[i]*book->dim;
|
|
|
21f867 |
}
|
|
|
21f867 |
for(i=0,o=0;i<book->dim;i++,o+=step)
|
|
|
21f867 |
- for (j=0;j
|
|
|
21f867 |
+ for (j=0;o+j
|
|
|
21f867 |
a[o+j]+=t[j][i];
|
|
|
21f867 |
}
|
|
|
21f867 |
return(0);
|
|
|
21f867 |
@@ -398,41 +398,12 @@ long vorbis_book_decodev_add(codebook *book,float *a,oggpack_buffer *b,int n){
|
|
|
21f867 |
int i,j,entry;
|
|
|
21f867 |
float *t;
|
|
|
21f867 |
|
|
|
21f867 |
- if(book->dim>8){
|
|
|
21f867 |
- for(i=0;i
|
|
|
21f867 |
- entry = decode_packed_entry_number(book,b);
|
|
|
21f867 |
- if(entry==-1)return(-1);
|
|
|
21f867 |
- t = book->valuelist+entry*book->dim;
|
|
|
21f867 |
- for (j=0;j<book->dim;)
|
|
|
21f867 |
- a[i++]+=t[j++];
|
|
|
21f867 |
- }
|
|
|
21f867 |
- }else{
|
|
|
21f867 |
- for(i=0;i
|
|
|
21f867 |
- entry = decode_packed_entry_number(book,b);
|
|
|
21f867 |
- if(entry==-1)return(-1);
|
|
|
21f867 |
- t = book->valuelist+entry*book->dim;
|
|
|
21f867 |
- j=0;
|
|
|
21f867 |
- switch((int)book->dim){
|
|
|
21f867 |
- case 8:
|
|
|
21f867 |
- a[i++]+=t[j++];
|
|
|
21f867 |
- case 7:
|
|
|
21f867 |
- a[i++]+=t[j++];
|
|
|
21f867 |
- case 6:
|
|
|
21f867 |
- a[i++]+=t[j++];
|
|
|
21f867 |
- case 5:
|
|
|
21f867 |
- a[i++]+=t[j++];
|
|
|
21f867 |
- case 4:
|
|
|
21f867 |
- a[i++]+=t[j++];
|
|
|
21f867 |
- case 3:
|
|
|
21f867 |
- a[i++]+=t[j++];
|
|
|
21f867 |
- case 2:
|
|
|
21f867 |
- a[i++]+=t[j++];
|
|
|
21f867 |
- case 1:
|
|
|
21f867 |
- a[i++]+=t[j++];
|
|
|
21f867 |
- case 0:
|
|
|
21f867 |
- break;
|
|
|
21f867 |
- }
|
|
|
21f867 |
- }
|
|
|
21f867 |
+ for(i=0;i
|
|
|
21f867 |
+ entry = decode_packed_entry_number(book,b);
|
|
|
21f867 |
+ if(entry==-1)return(-1);
|
|
|
21f867 |
+ t = book->valuelist+entry*book->dim;
|
|
|
21f867 |
+ for(j=0;i<n && j<book->dim;)
|
|
|
21f867 |
+ a[i++]+=t[j++];
|
|
|
21f867 |
}
|
|
|
21f867 |
}
|
|
|
21f867 |
return(0);
|
|
|
21f867 |
@@ -470,12 +441,13 @@ long vorbis_book_decodevv_add(codebook *book,float **a,long offset,int ch,
|
|
|
21f867 |
long i,j,entry;
|
|
|
21f867 |
int chptr=0;
|
|
|
21f867 |
if(book->used_entries>0){
|
|
|
21f867 |
- for(i=offset/ch;i<(offset+n)/ch;){
|
|
|
21f867 |
+ int m=(offset+n)/ch;
|
|
|
21f867 |
+ for(i=offset/ch;i
|
|
|
21f867 |
entry = decode_packed_entry_number(book,b);
|
|
|
21f867 |
if(entry==-1)return(-1);
|
|
|
21f867 |
{
|
|
|
21f867 |
const float *t = book->valuelist+entry*book->dim;
|
|
|
21f867 |
- for (j=0;j<book->dim;j++){
|
|
|
21f867 |
+ for (j=0;i<m && j<book->dim;j++){
|
|
|
21f867 |
a[chptr++][i]+=t[j];
|
|
|
21f867 |
if(chptr==ch){
|
|
|
21f867 |
chptr=0;
|
|
|
21f867 |
--
|
|
|
21f867 |
2.16.2
|
|
|
21f867 |
|