From c3797d40a1c57352192c6106cc0f435e7d9c11e8 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko 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 Signed-off-by: Denys Vlasenko Signed-off-by: Zhixiong Chi --- 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