Mercurial > vim
changeset 33862:242b964d6269 v9.0.2140
patch 9.0.2140: [security]: use-after-free in win-enter
Commit: https://github.com/vim/vim/commit/eec0c2b3a4cfab93dd8d4adaa60638d47a2bbc8a
Author: Christian Brabandt <cb@256bit.org>
Date: Tue Nov 28 22:03:48 2023 +0100
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 10 Dec 2023 15:16:01 +0100 |
| parents | e6c291944e18 |
| children | 3b8089d550eb |
| files | src/testdir/crash/poc_win_enter_ext src/testdir/test_crash.vim src/version.c src/window.c |
| diffstat | 4 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..73f53b575b699046d6bdc5402083dfa9c278769a GIT binary patch literal 1958 zc%0=^L2DCH5T1ZJWYX$u3!w_)1VV+{N{A;D!S-M+1Q7}1C81c~Ya(oRad$-zhNMSL z1<&eL0$%h`e}U&5a`5gis0bc{m*>2<CTVJ7kAj`U?!K9MGxL4(?RC%y+dcF|e?Qpn z?Jq6mdm;vWj^AFnh#Vn-1n7ExJ%3*aF(c+k7`rw4UKZj?Ops6Fkr1=&_qOW!K!oj6 z&RfU9CKYoisR{hxN*i}D%%bC7c4~@BL`6OVHa3dEH4GF5jl1$i4OVd#ZrHZ*c&Z+k zQtc2{70Pyj*1iakK1x5Sv8A7>7z&M#QNPlBrZvfj9}jdn*9?JBW^v2(7=zS59+Gb$ zbia1H-7=ev8<6&6h;x{fSZJlH2@{%~vl-{b&olfwU9uKfjIOsJ!7u=pj~uF-88T)m zFxV<Bg7kY7Bf?B*6L!swBXGlPg)^g)lCDNK!ry2i&25VFCdPSyN-M`5kWLxXnye$t znto=e5_814TqFlvciy(HoNY!0#OLE^TaKt%i8aPaV)k^ooJb7%aM`wFkd0v+2xD`= zjMBcM;mq$!8I!htZcG@WUPz_l4!qpMd)P)Jj2+LXkvI+uBN9antFO^_of;Y*i1Y>1 z{RjsDi<9MI^~?j)A7jJrh~8+S#Y37N)AFU%8?$RO?qI1;Cuo?*<g6Tik2=|9cc$4# zs`jS_JDm?x{Ld%&POO&9V*Z()CXN69XzC<bdXn?g-|wt<I(UFd{;`q=dJoI00N*f~ P#3v73>5<hB%R&AEpU1gh
--- a/src/testdir/test_crash.vim +++ b/src/testdir/test_crash.vim @@ -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, '$'))
--- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2140, +/**/ 2139, /**/ 2138,
--- a/src/window.c +++ b/src/window.c @@ -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