mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 13:49:49 +00:00
Code Issues Projects Releases Wiki Activity

lighttpd: Backport the CVE-2019-11072 fix

Browse Source 
(From OE-Core rev: abc2d1fad91f1378be3946e35d8f8f450823599e)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Adrian Bunk
2020-01-17 19:14:28 +02:00
committed by Richard Purdie
parent ef2bec784b
commit 057dcb3ee3
2 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/lighttpd/lighttpd/0001-core-fix-abort-in-http-parseopts-fixes-2945.patch
+54
View File
@@ -0,0 +1,54 @@
From 32120d5b8b3203fc21ccb9eafb0eaf824bb59354 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Wed, 10 Apr 2019 11:28:10 -0400
Subject: [core] fix abort in http-parseopts (fixes #2945)
fix abort in server.http-parseopts with url-path-2f-decode enabled
(thx stze)
x-ref:
"Security - SIGABRT during GET request handling with url-path-2f-decode enabled"
https://redmine.lighttpd.net/issues/2945
CVE: CVE-2019-11072
Upstream-Status: Backport
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
src/burl.c | 6 ++++--
src/t/test_burl.c | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/burl.c b/src/burl.c
index 51182628..c4b928fd 100644
--- a/src/burl.c
+++ b/src/burl.c
@@ -252,8 +252,10 @@ static int burl_normalize_2F_to_slash_fix (buffer *b, int qs, int i)
}
}
if (qs >= 0) {
- memmove(s+j, s+qs, blen - qs);
- j += blen - qs;
+ const int qslen = blen - qs;
+ memmove(s+j, s+qs, (size_t)qslen);
+ qs = j;
+ j += qslen;
}
buffer_string_set_length(b, j);
return qs;
diff --git a/src/t/test_burl.c b/src/t/test_burl.c
index 7be9be50..f7a16815 100644
--- a/src/t/test_burl.c
+++ b/src/t/test_burl.c
@@ -97,6 +97,8 @@ static void test_burl_normalize (void) {
flags |= HTTP_PARSEOPT_URL_NORMALIZE_PATH_2F_DECODE;
run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a/b?c=/"), CONST_STR_LEN("/a/b?c=/"));
run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a/b?c=%2f"), CONST_STR_LEN("/a/b?c=/"));
+ run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("%2f?"), CONST_STR_LEN("/?"));
+ run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/%2f?"), CONST_STR_LEN("//?"));
run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a%2fb"), CONST_STR_LEN("/a/b"));
run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a%2Fb"), CONST_STR_LEN("/a/b"));
run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a%2fb?c=/"), CONST_STR_LEN("/a/b?c=/"));
--
2.17.1
meta/recipes-extended/lighttpd/lighttpd_1.4.53.bb
+1
View File
@@ -17,6 +17,7 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
file://lighttpd.conf \ file://lighttpd.conf \
file://lighttpd \ file://lighttpd \
file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
file://0001-core-fix-abort-in-http-parseopts-fixes-2945.patch \
" "
SRC_URI[md5sum] = "f93436d8d400b2b0e26ee4bcc60b9ac7" SRC_URI[md5sum] = "f93436d8d400b2b0e26ee4bcc60b9ac7"