vorbis-tools: fix CVE-2015-6749
PATCH 1/1 vorbis-tools: fix CVE-2015-6749
From: Kai Kang <[email protected]>
Backport patch to fix CVE-2015-6749 from:
https://trac.xiph.org/ticket/2212
Signed-off-by Kai Kang <[email protected]>
--- ...oggenc-Fix-large-alloca-on-bad-AIFF-input.patch | 49 ++++++++++++++++++++++ .../vorbis-tools/vorbis-tools_1.4.0.bb | 4 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch new file +49 -0
@@ -0,0 +1,49 @@ +Upstream-Status: Backport + +Backport patch to fix CVE-2015-6749 from: + +https://trac.xiph.org/ticket/2212 + +Signed-off-by: Kai Kang <[email protected]> +--- +From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001 +From: Mark Harris <[email protected]> +Date: Sun, 30 Aug 2015 05:54:46 -0700 +Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input + +Fixes #2212 +--- + oggenc/audio.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/oggenc/audio.c b/oggenc/audio.c +index 477da8c..4921fb9 100644 +--- a/oggenc/audio.c ++++ b/oggenc/audio.c +@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] = + int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + { + int aifc; /* AIFC or AIFF? */ +- unsigned int len; +- unsigned char *buffer; ++ unsigned int len, readlen; ++ unsigned char buffer[22]; + unsigned char buf2[8]; + aiff_fmt format; + aifffile *aiff = malloc(sizeof(aifffile)); +@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + return 0; /* Weird common chunk */ + } + +- buffer = alloca(len); +- +- if(fread(buffer,1,len,in) < len) ++ readlen = len < sizeof(buffer) ? len : sizeof(buffer); ++ if(fread(buffer,1,readlen,in) < readlen || ++ (len > readlen && !seek_forward(in, len-readlen))) + { + fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); + return 0; +-- +2.5.0 +
meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb +3 -1
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libogg libvorbis curl libao" -SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz" +SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \ + file://0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch \ + " SRC_URI[md5sum] = "567e0fb8d321b2cd7124f8208b8b90e6" SRC_URI[sha256sum] = "a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc"
Signature · 1 line
2.6.1
PATCH 1/1 vorbis-tools: fix CVE-2015-6749
Quoted 5 lines · On 2015年10月16日 11:23, [email protected] wrote:
From: Kai Kang <[email protected]>
Backport patch to fix CVE-2015-6749 from:
Forgot layer info. Add it to title.
--Kai
Quoted 78 lines
Signed-off-by Kai Kang <[email protected]>--- ...oggenc-Fix-large-alloca-on-bad-AIFF-input.patch | 49 ++++++++++++++++++++++ .../vorbis-tools/vorbis-tools_1.4.0.bb | 4 +- 2 files changed, 52 insertions(+), 1 deletion(-)create mode 100644
meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patchmeta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch new file +49
-0@@ -0,0 +1,49 @@ +Upstream-Status: Backport + +Backport patch to fix CVE-2015-6749 from: + +https://trac.xiph.org/ticket/2212 + +Signed-off-by: Kai Kang <[email protected]> +--- +From 04815d3e1bfae3a6cdfb2c25358a5a72b61299f7 Mon Sep 17 00:00:00 2001 +From: Mark Harris <[email protected]> +Date: Sun, 30 Aug 2015 05:54:46 -0700 +Subject: [PATCH] oggenc: Fix large alloca on bad AIFF input + +Fixes #2212 +--- + oggenc/audio.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/oggenc/audio.c b/oggenc/audio.c +index 477da8c..4921fb9 100644 +--- a/oggenc/audio.c ++++ b/oggenc/audio.c +@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] = + int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + { + int aifc; /* AIFC or AIFF? */ +- unsigned int len; +- unsigned char *buffer; ++ unsigned int len, readlen; ++ unsigned char buffer[22]; + unsigned char buf2[8]; + aiff_fmt format; + aifffile *aiff = malloc(sizeof(aifffile)); +@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) + return 0; /* Weird common chunk */ + } + +- buffer = alloca(len); +- +- if(fread(buffer,1,len,in) < len) ++ readlen = len < sizeof(buffer) ? len : sizeof(buffer); ++ if(fread(buffer,1,readlen,in) < readlen || ++ (len > readlen && !seek_forward(in, len-readlen))) + { + fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); + return 0; +-- +2.5.0 +meta-multimedia/recipes-multimedia/vorbis-tools/vorbis-tools_1.4.0.bb +3
-1@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libogg libvorbis curl libao" -SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz" +SRC_URI = "http://downloads.xiph.org/releases/vorbis/${BP}.tar.gz \ + file://0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch \ + " SRC_URI[md5sum] = "567e0fb8d321b2cd7124f8208b8b90e6" SRC_URI[sha256sum] = "a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc"
Signature · 2 lines
Regards, Neil | Kai Kang