diff options
Diffstat (limited to 'meta/recipes-support/curl/curl/CVE-2016-8615.patch')
-rw-r--r-- | meta/recipes-support/curl/curl/CVE-2016-8615.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/meta/recipes-support/curl/curl/CVE-2016-8615.patch b/meta/recipes-support/curl/curl/CVE-2016-8615.patch new file mode 100644 index 0000000000..d897ade3ce --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2016-8615.patch @@ -0,0 +1,71 @@ +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 + +Upstream-Status: Backport +https://curl.haxx.se/CVE-2016-8615.patch + +CVE: CVE-2016-8615 +Signed-off-by: Thiruvadi Rajaraman <trajaraman@mvista.com> + +--- + lib/cookie.c | 31 ++++++++++++++++++++++++++++++- + 1 file changed, 30 insertions(+), 1 deletion(-) + +Index: curl-7.44.0/lib/cookie.c +=================================================================== +--- curl-7.44.0.orig/lib/cookie.c ++++ curl-7.44.0/lib/cookie.c +@@ -869,6 +869,35 @@ Curl_cookie_add(struct SessionHandle *da + 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() +@@ -925,7 +954,7 @@ struct CookieInfo *Curl_cookie_init(stru + 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]; |