mirror of
https://github.com/neovim/neovim.git
synced 2026-06-30 19:57:54 +00:00
vim-patch:9.2.0662: [security] Stack out-of-bounds write in dump_prefixes()
Problem: [security]: a crafted spell file with a self-referential
BY_INDEX node in the prefix tree can drive dump_prefixes()
past the end of its MAXWLEN-sized depth arrays on :spelldump
(cipher-creator)
Solution: only descend while depth < MAXWLEN - 1, as the sibling trie
walkers already do (Yasuhiro Matsumoto)
Github Security Advisory:
https://github.com/vim/vim/security/advisories/GHSA-qm9w-fmpj-879h
Supported by AI
8325b193bb
Co-authored-by: Yasuhiro Matsumoto <mattn.jp@gmail.com>
This commit is contained in:
@@ -3566,7 +3566,7 @@ static linenr_T dump_prefixes(slang_T *slang, char *word, char *pat, Direction *
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
} else if (depth < MAXWLEN - 1) {
|
||||
// Normal char, go one level deeper.
|
||||
prefix[depth++] = (char)c;
|
||||
arridx[depth] = idxs[n];
|
||||
|
||||
@@ -1592,4 +1592,31 @@ func Test_suggest_spell_restore()
|
||||
bwipe!
|
||||
endfunc
|
||||
|
||||
" A crafted .spl with a self-referential BY_INDEX node in the PREFIXTREE drove
|
||||
" dump_prefixes() past its MAXWLEN-sized depth arrays (stack out-of-bounds
|
||||
" write). The tree parses cleanly (shared refs aren't recursed); the walk
|
||||
" happens on :spelldump. Reaching the assert means no OOB. Same class as the
|
||||
" tree_count_words() fix (9.2.0653).
|
||||
func Test_spelldump_prefixtree_overflow()
|
||||
CheckUnix
|
||||
call mkdir('Xrtp/spell', 'pR')
|
||||
" VIMspell + v50, SN_PREFCOND(prefixcnt=1), SN_END,
|
||||
" LWORDTREE word "a" with affixID=1 (so dump_prefixes runs),
|
||||
" empty KWORDTREE, PREFIXTREE child BY_INDEX -> nodeidx 0 (self-cycle), 'A'
|
||||
let spl = eval('0z56494D7370656C6C32030000000003000100FF00000004'
|
||||
\ .. '0161010220010000000000000002010100000041')
|
||||
call writefile(spl, 'Xrtp/spell/xx.utf-8.spl', 'b')
|
||||
|
||||
new
|
||||
set runtimepath+=./Xrtp
|
||||
set spelllang=xx
|
||||
set spell
|
||||
spelldump
|
||||
call assert_true(line('$') > 1)
|
||||
|
||||
set spell& spelllang& runtimepath&
|
||||
bwipe!
|
||||
bwipe!
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
||||
Reference in New Issue
Block a user