diff options
Diffstat (limited to 'meta/recipes-extended/lighttpd/lighttpd/0001-core-fix-abort-in-http-parseopts-fixes-2945.patch')
-rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd/0001-core-fix-abort-in-http-parseopts-fixes-2945.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-extended/lighttpd/lighttpd/0001-core-fix-abort-in-http-parseopts-fixes-2945.patch b/meta/recipes-extended/lighttpd/lighttpd/0001-core-fix-abort-in-http-parseopts-fixes-2945.patch new file mode 100644 index 0000000000..123bb94c60 --- /dev/null +++ b/meta/recipes-extended/lighttpd/lighttpd/0001-core-fix-abort-in-http-parseopts-fixes-2945.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From 32120d5b8b3203fc21ccb9eafb0eaf824bb59354 Mon Sep 17 00:00:00 2001 | ||
2 | From: Glenn Strauss <gstrauss@gluelogic.com> | ||
3 | Date: Wed, 10 Apr 2019 11:28:10 -0400 | ||
4 | Subject: [core] fix abort in http-parseopts (fixes #2945) | ||
5 | |||
6 | fix abort in server.http-parseopts with url-path-2f-decode enabled | ||
7 | |||
8 | (thx stze) | ||
9 | |||
10 | x-ref: | ||
11 | "Security - SIGABRT during GET request handling with url-path-2f-decode enabled" | ||
12 | https://redmine.lighttpd.net/issues/2945 | ||
13 | |||
14 | CVE: CVE-2019-11072 | ||
15 | Upstream-Status: Backport | ||
16 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | ||
17 | --- | ||
18 | src/burl.c | 6 ++++-- | ||
19 | src/t/test_burl.c | 2 ++ | ||
20 | 2 files changed, 6 insertions(+), 2 deletions(-) | ||
21 | |||
22 | diff --git a/src/burl.c b/src/burl.c | ||
23 | index 51182628..c4b928fd 100644 | ||
24 | --- a/src/burl.c | ||
25 | +++ b/src/burl.c | ||
26 | @@ -252,8 +252,10 @@ static int burl_normalize_2F_to_slash_fix (buffer *b, int qs, int i) | ||
27 | } | ||
28 | } | ||
29 | if (qs >= 0) { | ||
30 | - memmove(s+j, s+qs, blen - qs); | ||
31 | - j += blen - qs; | ||
32 | + const int qslen = blen - qs; | ||
33 | + memmove(s+j, s+qs, (size_t)qslen); | ||
34 | + qs = j; | ||
35 | + j += qslen; | ||
36 | } | ||
37 | buffer_string_set_length(b, j); | ||
38 | return qs; | ||
39 | diff --git a/src/t/test_burl.c b/src/t/test_burl.c | ||
40 | index 7be9be50..f7a16815 100644 | ||
41 | --- a/src/t/test_burl.c | ||
42 | +++ b/src/t/test_burl.c | ||
43 | @@ -97,6 +97,8 @@ static void test_burl_normalize (void) { | ||
44 | flags |= HTTP_PARSEOPT_URL_NORMALIZE_PATH_2F_DECODE; | ||
45 | run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a/b?c=/"), CONST_STR_LEN("/a/b?c=/")); | ||
46 | run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a/b?c=%2f"), CONST_STR_LEN("/a/b?c=/")); | ||
47 | + run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("%2f?"), CONST_STR_LEN("/?")); | ||
48 | + run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/%2f?"), CONST_STR_LEN("//?")); | ||
49 | run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a%2fb"), CONST_STR_LEN("/a/b")); | ||
50 | run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a%2Fb"), CONST_STR_LEN("/a/b")); | ||
51 | run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a%2fb?c=/"), CONST_STR_LEN("/a/b?c=/")); | ||
52 | -- | ||
53 | 2.17.1 | ||
54 | |||