forked from aniani/vim
patch 9.0.2141: [security]: buffer-overflow in suggest_trie_walk
Problem: [security]: buffer-overflow in suggest_trie_walk Solution: Check n before using it as index into byts array Basically, n as an index into the byts array, can point to beyond the byts array. So let's double check, that n is within the expected range after incrementing it from sp->ts_curi and bail out if it would be invalid. Reported by @henices, thanks! Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@@ -2175,6 +2175,13 @@ suggest_trie_walk(
|
|||||||
// - Skip the byte if it's equal to the byte in the word,
|
// - Skip the byte if it's equal to the byte in the word,
|
||||||
// accepting that byte is always better.
|
// accepting that byte is always better.
|
||||||
n += sp->ts_curi++;
|
n += sp->ts_curi++;
|
||||||
|
|
||||||
|
// break out, if we would be accessing byts buffer out of bounds
|
||||||
|
if (byts == slang->sl_fbyts && n >= slang->sl_fbyts_len)
|
||||||
|
{
|
||||||
|
got_int = TRUE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
c = byts[n];
|
c = byts[n];
|
||||||
if (soundfold && sp->ts_twordlen == 0 && c == '*')
|
if (soundfold && sp->ts_twordlen == 0 && c == '*')
|
||||||
// Inserting a vowel at the start of a word counts less,
|
// Inserting a vowel at the start of a word counts less,
|
||||||
|
BIN
src/testdir/crash/poc_suggest_trie_walk
Normal file
BIN
src/testdir/crash/poc_suggest_trie_walk
Normal file
Binary file not shown.
@@ -135,6 +135,13 @@ func Test_crash1_2()
|
|||||||
\ ' && echo "crash 2: [OK]" >> '.. result .. "\<cr>")
|
\ ' && echo "crash 2: [OK]" >> '.. result .. "\<cr>")
|
||||||
call TermWait(buf, 350)
|
call TermWait(buf, 350)
|
||||||
|
|
||||||
|
let file = 'crash/poc_suggest_trie_walk'
|
||||||
|
let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
|
||||||
|
let args = printf(cmn_args, vim, file)
|
||||||
|
call term_sendkeys(buf, args ..
|
||||||
|
\ ' && echo "crash 3: [OK]" >> '.. result .. "\<cr>")
|
||||||
|
call TermWait(buf, 150)
|
||||||
|
|
||||||
" clean up
|
" clean up
|
||||||
exe buf .. "bw!"
|
exe buf .. "bw!"
|
||||||
|
|
||||||
@@ -143,6 +150,7 @@ func Test_crash1_2()
|
|||||||
let expected = [
|
let expected = [
|
||||||
\ 'crash 1: [OK]',
|
\ 'crash 1: [OK]',
|
||||||
\ 'crash 2: [OK]',
|
\ 'crash 2: [OK]',
|
||||||
|
\ 'crash 3: [OK]',
|
||||||
\ ]
|
\ ]
|
||||||
|
|
||||||
call assert_equal(expected, getline(1, '$'))
|
call assert_equal(expected, getline(1, '$'))
|
||||||
|
@@ -704,6 +704,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2141,
|
||||||
/**/
|
/**/
|
||||||
2140,
|
2140,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user