lineedit: do not tab-complete any strings which have control characters function old new delta add_match 41 68 +27
Affects busybox <= 1.27.2 Signed-off-by: Jagadeesh Krishnanjanappa <[email protected]> --- .../busybox/busybox/CVE-2017-16544.patch | 44 ++++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.24.1.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/CVE-2017-16544.patch diff --git a/meta/recipes-core/busybox/busybox/CVE-2017-16544.patch b/meta/recipes-core/busybox/busybox/CVE-2017-16544.patch new file mode 100644 index 0000000..8038886 --- /dev/null +++ b/meta/recipes-core/busybox/busybox/CVE-2017-16544.patch @@ -0,0 +1,44 @@ +From c3797d40a1c57352192c6106cc0f435e7d9c11e8 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <[email protected]> +Date: Tue, 7 Nov 2017 18:09:29 +0100 +Subject: lineedit: do not tab-complete any strings which have control + characters + +function old new delta +add_match 41 68 +27 + +CVE: CVE-2017-16544 +Upstream-Status: Backport from v1.28.0 + +Signed-off-by: Jagadeesh Krishnanjanappa <[email protected]> +Signed-off-by: Denys Vlasenko <[email protected]> +--- + libbb/lineedit.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/libbb/lineedit.c b/libbb/lineedit.c +index c0e35bb..56e8140 100644 +--- a/libbb/lineedit.c ++++ b/libbb/lineedit.c +@@ -645,6 +645,18 @@ static void free_tab_completion_data(void) + + static void add_match(char *matched) + { ++ unsigned char *p = (unsigned char*)matched; ++ while (*p) { ++ /* ESC attack fix: drop any string with control chars */ ++ if (*p < ' ' ++ || (!ENABLE_UNICODE_SUPPORT && *p >= 0x7f) ++ || (ENABLE_UNICODE_SUPPORT && *p == 0x7f) ++ ) { ++ free(matched); ++ return; ++ } ++ p++; ++ } + matches = xrealloc_vector(matches, 4, num_matches); + matches[num_matches] = matched; + num_matches++; +-- +cgit v0.12 + diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index 1c85808..a2c0aa3 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb @@ -61,6 +61,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-tar-add-IF_FEATURE_-checks.patch \ file://0001-iproute-support-scope-.-Closes-8561.patch \ file://0001-ip-fix-an-improper-optimization-req.r.rtm_scope-may-.patch \ + file://CVE-2017-16544.patch \ " SRC_URI_append_libc-musl = " file://musl.cfg " -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
