mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
vim: fix CVE-2021-3778
vim is vulnerable to Heap-based Buffer Overflow reference: https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f (From OE-Core rev: 494929c4cec21712884e13172c37efad7c908411) (From OE-Core rev: d7fac573f1e1c9cd93181bce60df5666f5b5b03f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
35b8966e61
commit
59a0f26b8a
@@ -0,0 +1,46 @@
|
|||||||
|
From eb41373c8c88b0789e5cf04669d6116f9a199264 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Minjae Kim <flowergom@gmail.com>
|
||||||
|
Date: Sun, 26 Sep 2021 23:48:00 +0000
|
||||||
|
Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8
|
||||||
|
character
|
||||||
|
|
||||||
|
Problem: Reading beyond end of line with invalid utf-8 character.
|
||||||
|
Solution: Check for NUL when advancing.
|
||||||
|
|
||||||
|
Upstream-Status: Accepted [https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f]
|
||||||
|
CVE: CVE-2021-3778
|
||||||
|
Signed-off-by: Minjae Kim <flowergom@gmail.com>
|
||||||
|
---
|
||||||
|
src/regexp_nfa.c | 3 ++-
|
||||||
|
src/testdir/test_regexp_utf8.vim | 7 +++++++
|
||||||
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
Index: git/src/regexp_nfa.c
|
||||||
|
===================================================================
|
||||||
|
--- git.orig/src/regexp_nfa.c
|
||||||
|
+++ git/src/regexp_nfa.c
|
||||||
|
@@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int re
|
||||||
|
match = FALSE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
- len2 += MB_CHAR2LEN(c2);
|
||||||
|
+ len2 += enc_utf8 ? utf_ptr2len(rex.line + col + len2)
|
||||||
|
+ : MB_CHAR2LEN(c2);
|
||||||
|
}
|
||||||
|
if (match
|
||||||
|
// check that no composing char follows
|
||||||
|
Index: git/src/testdir/test_regexp_utf8.vim
|
||||||
|
===================================================================
|
||||||
|
--- git.orig/src/testdir/test_regexp_utf8.vim
|
||||||
|
+++ git/src/testdir/test_regexp_utf8.vim
|
||||||
|
@@ -215,3 +215,10 @@ func Test_optmatch_toolong()
|
||||||
|
set re=0
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
+func Test_match_invalid_byte()
|
||||||
|
+ call writefile(0z630a.765d30aa0a.2e0a.790a.4030, 'Xinvalid')
|
||||||
|
+ new
|
||||||
|
+ source Xinvalid
|
||||||
|
+ bwipe!
|
||||||
|
+ call delete('Xinvalid')
|
||||||
|
+endfunc
|
||||||
@@ -18,6 +18,7 @@ SRC_URI = "git://github.com/vim/vim.git \
|
|||||||
file://no-path-adjust.patch \
|
file://no-path-adjust.patch \
|
||||||
file://racefix.patch \
|
file://racefix.patch \
|
||||||
file://b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch \
|
file://b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch \
|
||||||
|
file://CVE-2021-3778.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44"
|
SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44"
|
||||||
|
|||||||
Reference in New Issue
Block a user