diff options
author | Sergey Lukin <sergej.lukin@gmail.com> | 2016-12-09 08:23:32 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2016-12-26 09:46:12 +0000 |
commit | ba3dc3d210189d8b88c35c3b6850f54f8041f3fa (patch) | |
tree | b1ecf74c7594105573debcf6ccfd2f67522c03c6 /main/curl/CVE-2016-8615.patch | |
parent | f7fb6eb9c7b2bdc8ac41b605df86bb2fa114e89a (diff) |
main/curl: security upgrade - fixes #64373.1-stable
CVE-2016-8615, CVE-2016-8616, CVE-2016-8617, CVE-2016-8618, CVE-2016-8619,
CVE-2016-8620, CVE-2016-8621 CVE-2016-8622, CVE-2016-8623, CVE-2016-8624
Diffstat (limited to 'main/curl/CVE-2016-8615.patch')
-rw-r--r-- | main/curl/CVE-2016-8615.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/main/curl/CVE-2016-8615.patch b/main/curl/CVE-2016-8615.patch new file mode 100644 index 00000000000..d1fda35a9bb --- /dev/null +++ b/main/curl/CVE-2016-8615.patch @@ -0,0 +1,75 @@ +From 1620f552a277ed5b23a48b9c27dbf07663cac068 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Tue, 27 Sep 2016 17:36:19 +0200 +Subject: [PATCH] cookie: replace use of fgets() with custom version + +... that will ignore lines that are too long to fit in the buffer. + +CVE-2016-8615 + +Bug: https://curl.haxx.se/docs/adv_20161102A.html +Reported-by: Cure53 +--- + lib/cookie.c | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +diff --git a/lib/cookie.c b/lib/cookie.c +index 0f05da2..e5097d3 100644 +--- a/lib/cookie.c ++++ b/lib/cookie.c +@@ -901,10 +901,39 @@ Curl_cookie_add(struct Curl_easy *data, + } + + return co; + } + ++/* ++ * get_line() makes sure to only return complete whole lines that fit in 'len' ++ * bytes and end with a newline. ++ */ ++static char *get_line(char *buf, int len, FILE *input) ++{ ++ bool partial = FALSE; ++ while(1) { ++ char *b = fgets(buf, len, input); ++ if(b) { ++ size_t rlen = strlen(b); ++ if(rlen && (b[rlen-1] == '\n')) { ++ if(partial) { ++ partial = FALSE; ++ continue; ++ } ++ return b; ++ } ++ else ++ /* read a partial, discard the next piece that ends with newline */ ++ partial = TRUE; ++ } ++ else ++ break; ++ } ++ return NULL; ++} ++ ++ + /***************************************************************************** + * + * Curl_cookie_init() + * + * Inits a cookie struct to read data from a local file. This is always +@@ -957,11 +986,11 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, + bool headerline; + + line = malloc(MAX_COOKIE_LINE); + if(!line) + goto fail; +- while(fgets(line, MAX_COOKIE_LINE, fp)) { ++ while(get_line(line, MAX_COOKIE_LINE, fp)) { + if(checkprefix("Set-Cookie:", line)) { + /* This is a cookie line, get it! */ + lineptr=&line[11]; + headerline=TRUE; + } +-- +2.9.3 + |