kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.2141: [security]: buffer-overflow in suggest_trie_walk

Browse Source 
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!

0fb375aae6

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2023-12-02 10:07:13 +08:00
parent 7402655132
commit 01edcd6db8
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/spellsuggest.c
View File

@ -1941,6 +1941,12 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char *fword, bool soun
// - 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
test/old/testdir/crash/poc_suggest_trie_walk Normal file
View File

Binary file not shown.

8
test/old/testdir/test_crash.vim
View File

@ -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, '$'))