diff options
author | Ross Burton <ross@burtonini.com> | 2021-11-30 16:53:12 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-01 16:23:45 +0000 |
commit | 3eecf843e7f9462d743dc766ba25cfaa5f48b3e0 (patch) | |
tree | 863a06ba437a4de927f5854b55cd4195589a3da2 /meta/recipes-support/vim/vim.inc | |
parent | 7d2b8ac293c092491eb6a547728a4a687e4b93b1 (diff) | |
download | poky-3eecf843e7f9462d743dc766ba25cfaa5f48b3e0.tar.gz |
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 <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/vim/vim.inc')
-rw-r--r-- | meta/recipes-support/vim/vim.inc | 4 |
1 files changed, 4 insertions, 0 deletions
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 \ | |||
25 | file://0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch \ | 25 | file://0005-patch-8.2.3564-invalid-memory-access-when-scrolling-.patch \ |
26 | file://0001-patch-8.2.3581-reading-character-past-end-of-line.patch \ | 26 | file://0001-patch-8.2.3581-reading-character-past-end-of-line.patch \ |
27 | file://0002-patch-8.2.3582-reading-uninitialized-memory-when-giv.patch \ | 27 | file://0002-patch-8.2.3582-reading-uninitialized-memory-when-giv.patch \ |
28 | file://0002-patch-8.2.3611-crash-when-using-CTRL-W-f-without-fin.patch \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" | 31 | SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" |
@@ -32,6 +33,9 @@ SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" | |||
32 | # Do not consider .z in x.y.z, as that is updated with every commit | 33 | # Do not consider .z in x.y.z, as that is updated with every commit |
33 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" | 34 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" |
34 | 35 | ||
36 | # CVE-2021-3968 is related to an issue which was introduced after 8.2, this can be removed after 8.3. | ||
37 | CVE_CHECK_WHITELIST += "CVE-2021-3968" | ||
38 | |||
35 | S = "${WORKDIR}/git" | 39 | S = "${WORKDIR}/git" |
36 | 40 | ||
37 | VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" | 41 | VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}" |