diff options
Diffstat (limited to 'meta/recipes-support/curl/curl/CVE-2016-8619.patch')
-rw-r--r-- | meta/recipes-support/curl/curl/CVE-2016-8619.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-support/curl/curl/CVE-2016-8619.patch b/meta/recipes-support/curl/curl/CVE-2016-8619.patch deleted file mode 100644 index fb21cf6b89..0000000000 --- a/meta/recipes-support/curl/curl/CVE-2016-8619.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
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 | |||