aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/mysql/mariadb
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2015-08-19 14:46:05 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-08-31 19:11:12 +0200
commit4fc4326a0c7510d293b8108696beda4b395e0e2d (patch)
tree82f737ea424ae8fdafd3a1c156cf52bf7de018cc /meta-oe/recipes-support/mysql/mariadb
parent3551575f9b69ca3d5f06321e444c9f8105c0a1b2 (diff)
downloadmeta-openembedded-4fc4326a0c7510d293b8108696beda4b395e0e2d.tar.gz
meta-openembedded-4fc4326a0c7510d293b8108696beda4b395e0e2d.tar.bz2
meta-openembedded-4fc4326a0c7510d293b8108696beda4b395e0e2d.zip
mariadb: update to 5.5.45
This is the latest release in the 5.5.x stable series. The CVE patch has been applied upstream. Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql/mariadb')
-rw-r--r--meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch b/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
deleted file mode 100644
index 2d1b46734..000000000
--- a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-