diff options
author | Sona Sarmadi <sona.sarmadi@enea.com> | 2016-11-15 10:08:14 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-18 13:14:20 +0100 |
commit | f5e807efc7e40b792003e1888bdcd6641bcfcc90 (patch) | |
tree | c75033be0d1d008d2d82c886f990acbf0f54076a /meta | |
parent | cf7507f8c426f86b7986d7fcbf36465f51500c74 (diff) | |
download | poky-f5e807efc7e40b792003e1888bdcd6641bcfcc90.tar.gz |
curl: CVE-2016-8619
double-free in krb5 code
Affected versions: curl 7.3 to and including 7.50.3
Reference:
https://curl.haxx.se/docs/adv_20161102E.html
(From OE-Core rev: 4e18b8af45e1e7769842952f773ba71276e24372)
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/curl/curl/CVE-2016-8619.patch | 52 | ||||
-rw-r--r-- | meta/recipes-support/curl/curl_7.47.1.bb | 1 |
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl/CVE-2016-8619.patch b/meta/recipes-support/curl/curl/CVE-2016-8619.patch new file mode 100644 index 0000000000..fb21cf6b89 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2016-8619.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From 91239f7040b1f026d4d15765e7e3f58e92e93761 Mon Sep 17 00:00:00 2001 | ||
2 | From: Daniel Stenberg <daniel@haxx.se> | ||
3 | Date: Wed, 28 Sep 2016 12:56:02 +0200 | ||
4 | Subject: [PATCH] krb5: avoid realloc(0) | ||
5 | |||
6 | If the requested size is zero, bail out with error instead of doing a | ||
7 | realloc() that would cause a double-free: realloc(0) acts as a free() | ||
8 | and then there's a second free in the cleanup path. | ||
9 | |||
10 | CVE: CVE-2016-8619 | ||
11 | Upstream-Status: Backport | ||
12 | |||
13 | Bug: https://curl.haxx.se/docs/adv_20161102E.html | ||
14 | Reported-by: Cure53 | ||
15 | Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com> | ||
16 | --- | ||
17 | lib/security.c | 9 ++++++--- | ||
18 | 1 file changed, 6 insertions(+), 3 deletions(-) | ||
19 | |||
20 | diff --git a/lib/security.c b/lib/security.c | ||
21 | index a268d4a..4cef8f8 100644 | ||
22 | --- a/lib/security.c | ||
23 | +++ b/lib/security.c | ||
24 | @@ -190,19 +190,22 @@ socket_write(struct connectdata *conn, curl_socket_t fd, const void *to, | ||
25 | static CURLcode read_data(struct connectdata *conn, | ||
26 | curl_socket_t fd, | ||
27 | struct krb5buffer *buf) | ||
28 | { | ||
29 | int len; | ||
30 | - void* tmp; | ||
31 | + void *tmp = NULL; | ||
32 | CURLcode result; | ||
33 | |||
34 | result = socket_read(fd, &len, sizeof(len)); | ||
35 | if(result) | ||
36 | return result; | ||
37 | |||
38 | - len = ntohl(len); | ||
39 | - tmp = realloc(buf->data, len); | ||
40 | + if(len) { | ||
41 | + /* only realloc if there was a length */ | ||
42 | + len = ntohl(len); | ||
43 | + tmp = realloc(buf->data, len); | ||
44 | + } | ||
45 | if(tmp == NULL) | ||
46 | return CURLE_OUT_OF_MEMORY; | ||
47 | |||
48 | buf->data = tmp; | ||
49 | result = socket_read(fd, buf->data, len); | ||
50 | -- | ||
51 | 2.9.3 | ||
52 | |||
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb index 27a999ee97..9ef571834e 100644 --- a/meta/recipes-support/curl/curl_7.47.1.bb +++ b/meta/recipes-support/curl/curl_7.47.1.bb | |||
@@ -19,6 +19,7 @@ SRC_URI += " file://configure_ac.patch \ | |||
19 | file://CVE-2016-8616.patch \ | 19 | file://CVE-2016-8616.patch \ |
20 | file://CVE-2016-8617.patch \ | 20 | file://CVE-2016-8617.patch \ |
21 | file://CVE-2016-8618.patch \ | 21 | file://CVE-2016-8618.patch \ |
22 | file://CVE-2016-8619.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb" | 25 | SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb" |