From 3eecf843e7f9462d743dc766ba25cfaa5f48b3e0 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 30 Nov 2021 16:53:12 +0000 Subject: vim: fix CVE-2021-3968 and CVE-2021-3973 Backport a fix for -3972, and whitelist -3968: it isn't valid as it fixes a bug which was introduced after 8.2. (From OE-Core rev: bec5caadfb53638748d8c41ce7230c2bf7808d27) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/vim/vim.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/recipes-support/vim/vim.inc') diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index d0957bfeae..6cdf157cb6 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -25,6 +25,7 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch \ file://0001-patch-8.2.3581-reading-character-past-end-of-line.patch \ file://0002-patch-8.2.3582-reading-uninitialized-memory-when-giv.patch \ + file://0002-patch-8.2.3611-crash-when-using-CTRL-W-f-without-fin.patch \ " SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" @@ -32,6 +33,9 @@ SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" +# CVE-2021-3968 is related to an issue which was introduced after 8.2, this can be removed after 8.3. +CVE_CHECK_WHITELIST += "CVE-2021-3968" + S = "${WORKDIR}/git" VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" -- cgit v1.2.3-54-g00ecf