CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mariadb: Security Advisory -CVE-2015-2305

Browse Source 
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-2305

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

Conflicts:
	meta-oe/recipes-support/mysql/mariadb_5.5.39.inc
This commit is contained in:
Roy Li 2015-06-01 16:04:16 +08:00 committed by Armin Kuster
parent c580b62cb2
commit 0fb90bef8c
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch Normal file
View File

@ -0,0 +1,43 @@
From f5c1d00a9ceb61acfe038dcf2ec0236c2939328c Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com>
Date: Mon, 1 Jun 2015 15:31:48 +0800
Subject: [PATCH] From 70bc2965604b6b8aaf260049e64c708dddf85334 Mon Sep 17
00:00:00 2001 From: Gary Houston <ghouston@arglist.com> Date: Wed, 25 Feb
2015 13:29:03 +1100 Subject: [PATCH] Bug fix for integer overflow in regcomp
for excessively long pattern strings. CERT Vulnerability Note VU#695940.
Found by Guido Vranken.
Upsteam-Status: Backport
https://bugzilla.suse.com/attachment.cgi?id=627001
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
regex/regcomp.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/regex/regcomp.c b/regex/regcomp.c
index abc1817..31e57c1 100644
--- a/regex/regcomp.c
+++ b/regex/regcomp.c
@@ -138,7 +138,16 @@ struct cclass cclasses[CCLASS_LAST+1]= {
(NC-1)*sizeof(cat_t));
if (g == NULL)
return(REG_ESPACE);
- p->ssize = (long) (len/(size_t)2*(size_t)3 + (size_t)1); /* ugh */
+ {
+ /* Patched for CERT Vulnerability Note VU#695940, Feb 2015. */
+ size_t new_ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */
+ if (new_ssize < len || new_ssize > LONG_MAX / sizeof(sop)) {
+ free((char *) g);
+ return REG_INVARG;
+ }
+ p->ssize = new_ssize;
+ }
+
p->strip = (sop *)malloc(p->ssize * sizeof(sop));
p->slen = 0;
if (p->strip == NULL) {
--
1.9.1

1
meta-oe/recipes-support/mysql/mariadb_5.5.39.inc
View File

@ -10,6 +10,7 @@ SRC_URI = "http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-$
file://fix-mysqlclient-r-version.patch \
file://my.cnf \
file://mysqld.service \
file://fix-CVE-2015-2305.patch \
"
SRC_URI[md5sum] = "917a807d8cf2c8ef9deedd2a89b6decd"