1
0
forked from aniani/vim

patch 9.0.2140: [security]: use-after-free in win-enter

Problem:  [security]: use-after-free in win-enter
Solution: validate window pointer before calling win_enter()

win_goto() may stop visual mode, if it is active. However, this may in
turn trigger the ModeChanged autocommand, which could potentially free
the wp pointer which was valid before now became stale and points to now
freed memory.

So before calling win_enter(), let's verify one more time, that the
wp pointer still points to a valid window structure.

Reported by @henices, thanks!

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2023-11-28 22:03:48 +01:00
parent 9cc95aa0d8
commit eec0c2b3a4
4 changed files with 16 additions and 0 deletions

Binary file not shown.

View File

@@ -128,6 +128,13 @@ func Test_crash1_2()
\ ' && echo "crash 1: [OK]" > '.. result .. "\<cr>")
call TermWait(buf, 150)
let file = 'crash/poc_win_enter_ext'
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 2: [OK]" >> '.. result .. "\<cr>")
call TermWait(buf, 350)
" clean up
exe buf .. "bw!"
@@ -135,6 +142,7 @@ func Test_crash1_2()
let expected = [
\ 'crash 1: [OK]',
\ 'crash 2: [OK]',
\ ]
call assert_equal(expected, getline(1, '$'))

View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2140,
/**/
2139,
/**/

View File

@@ -5013,6 +5013,7 @@ tabpage_move(int nr)
* Go to another window.
* When jumping to another buffer, stop Visual mode. Do this before
* changing windows so we can yank the selection into the '*' register.
* (note: this may trigger ModeChanged autocommand!)
* When jumping to another window on the same buffer, adjust its cursor
* position to keep the same Visual area.
*/
@@ -5039,10 +5040,15 @@ win_goto(win_T *wp)
}
if (wp->w_buffer != curbuf)
// careful: triggers ModeChanged autocommand
reset_VIsual_and_resel();
else if (VIsual_active)
wp->w_cursor = curwin->w_cursor;
// autocommand may have made wp invalid
if (!win_valid(wp))
return;
#ifdef FEAT_GUI
need_mouse_correct = TRUE;
#endif