vim-patch:9.1.0647: [security] use-after-free in tagstack_clear_entry

Problem:  [security] use-after-free in tagstack_clear_entry
          (Suyue Guo )
Solution: Instead of manually calling vim_free() on each of the tagstack
          entries, let's use tagstack_clear_entry(), which will
          also free the stack, but using the VIM_CLEAR macro,
          which prevents a use-after-free by setting those pointers
          to NULL

This addresses CVE-2024-41957

Github advisory:
https://github.com/vim/vim/security/advisories/GHSA-f9cr-gv85-hcr4

8a0bbe7b8a

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-08-02 06:00:02 +08:00
parent a4bec30b7b
commit 6af359ef4c
4 changed files with 27 additions and 2 deletions

View File

@ -73,6 +73,7 @@
#include "nvim/statusline.h" #include "nvim/statusline.h"
#include "nvim/strings.h" #include "nvim/strings.h"
#include "nvim/syntax.h" #include "nvim/syntax.h"
#include "nvim/tag.h"
#include "nvim/terminal.h" #include "nvim/terminal.h"
#include "nvim/types_defs.h" #include "nvim/types_defs.h"
#include "nvim/ui.h" #include "nvim/ui.h"
@ -5205,8 +5206,7 @@ void win_free(win_T *wp, tabpage_T *tp)
xfree(wp->w_lines); xfree(wp->w_lines);
for (int i = 0; i < wp->w_tagstacklen; i++) { for (int i = 0; i < wp->w_tagstacklen; i++) {
xfree(wp->w_tagstack[i].tagname); tagstack_clear_entry(&wp->w_tagstack[i]);
xfree(wp->w_tagstack[i].user_data);
} }
xfree(wp->w_localdir); xfree(wp->w_localdir);

View File

@ -1,8 +1,12 @@
local t = require('test.testutil')
local n = require('test.functional.testnvim')() local n = require('test.functional.testnvim')()
local assert_alive = n.assert_alive local assert_alive = n.assert_alive
local clear = n.clear local clear = n.clear
local command = n.command local command = n.command
local eq = t.eq
local eval = n.eval
local exec = n.exec
local feed = n.feed local feed = n.feed
before_each(clear) before_each(clear)
@ -32,3 +36,18 @@ it('no crash with very long option error message', function()
pcall(command, 'source test/old/testdir/crash/poc_did_set_langmap') pcall(command, 'source test/old/testdir/crash/poc_did_set_langmap')
assert_alive() assert_alive()
end) end)
it('no crash when closing window with tag in loclist', function()
exec([[
new
lexpr ['foo']
lopen
let g:qf_bufnr = bufnr()
lclose
call settagstack(1, #{items: [#{tagname: 'foo', from: [g:qf_bufnr, 1, 1, 0]}]})
]])
eq(1, eval('bufexists(g:qf_bufnr)'))
command('1close')
eq(0, eval('bufexists(g:qf_bufnr)'))
assert_alive()
end)

Binary file not shown.

View File

@ -190,6 +190,12 @@ func Test_crash1_3()
call term_sendkeys(buf, args) call term_sendkeys(buf, args)
call TermWait(buf, 150) call TermWait(buf, 150)
let file = 'crash/double_free'
let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'\<cr>"
let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args)
call TermWait(buf, 50)
" clean up " clean up
exe buf .. "bw!" exe buf .. "bw!"
bw! bw!