diff options
| author | Hitendra Prajapati <hprajapati@mvista.com> | 2026-04-02 09:28:01 +0530 |
|---|---|---|
| committer | Paul Barker <paul@pbarker.dev> | 2026-04-10 11:53:18 +0100 |
| commit | 866e6ed3b873a51ce6edb4a5d99299f57c9754af (patch) | |
| tree | 80eb096e1afb28c1f90f8e138c77a7a7cc37a7de /meta/recipes-support | |
| parent | fc72adbf802309a7bfc0b8c9596b8be01b1bb857 (diff) | |
| download | poky-866e6ed3b873a51ce6edb4a5d99299f57c9754af.tar.gz | |
vim: Fix CVE-2026-33412
Pick patch from [1] also mentioned in NVD report with [2]
[1] https://github.com/vim/vim/commit/645ed6597d1ea896c712cd7ddbb6edee79577e9a
[2] https://nvd.nist.gov/vuln/detail/CVE-2026-33412
(From OE-Core rev: 910667342b78fefa22214f6375b657e8b130a24a)
Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Paul Barker <paul@pbarker.dev>
Diffstat (limited to 'meta/recipes-support')
| -rw-r--r-- | meta/recipes-support/vim/files/CVE-2026-33412.patch | 61 | ||||
| -rw-r--r-- | meta/recipes-support/vim/vim.inc | 1 |
2 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-support/vim/files/CVE-2026-33412.patch b/meta/recipes-support/vim/files/CVE-2026-33412.patch new file mode 100644 index 0000000000..62daa308b5 --- /dev/null +++ b/meta/recipes-support/vim/files/CVE-2026-33412.patch | |||
| @@ -0,0 +1,61 @@ | |||
| 1 | From 645ed6597d1ea896c712cd7ddbb6edee79577e9a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: pyllyukko <pyllyukko@maimed.org> | ||
| 3 | Date: Thu, 19 Mar 2026 19:58:05 +0000 | ||
| 4 | Subject: [PATCH] patch 9.2.0202: [security]: command injection via newline in | ||
| 5 | glob() | ||
| 6 | |||
| 7 | Problem: The glob() function on Unix-like systems does not escape | ||
| 8 | newline characters when expanding wildcards. A maliciously | ||
| 9 | crafted string containing '\n' can be used as a command | ||
| 10 | separator to execute arbitrary shell commands via | ||
| 11 | mch_expand_wildcards(). This depends on the user's 'shell' | ||
| 12 | setting. | ||
| 13 | Solution: Add the newline character ('\n') to the SHELL_SPECIAL | ||
| 14 | definition to ensure it is properly escaped before being | ||
| 15 | passed to the shell (pyllyukko). | ||
| 16 | |||
| 17 | closes: #19746 | ||
| 18 | |||
| 19 | Github Advisory: | ||
| 20 | https://github.com/vim/vim/security/advisories/GHSA-w5jw-f54h-x46c | ||
| 21 | |||
| 22 | Signed-off-by: pyllyukko <pyllyukko@maimed.org> | ||
| 23 | Signed-off-by: Christian Brabandt <cb@256bit.org> | ||
| 24 | |||
| 25 | CVE: CVE-2026-33412 | ||
| 26 | Upstream-Status: Backport [https://github.com/vim/vim/commit/645ed6597d1ea896c712cd7ddbb6edee79577e9a] | ||
| 27 | Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com> | ||
| 28 | --- | ||
| 29 | src/os_unix.c | 2 +- | ||
| 30 | src/version.c | 2 ++ | ||
| 31 | 2 files changed, 3 insertions(+), 1 deletion(-) | ||
| 32 | |||
| 33 | diff --git a/src/os_unix.c b/src/os_unix.c | ||
| 34 | index cf195e62e1..d767956b1a 100644 | ||
| 35 | --- a/src/os_unix.c | ||
| 36 | +++ b/src/os_unix.c | ||
| 37 | @@ -7106,7 +7106,7 @@ mch_expandpath( | ||
| 38 | # define SEEK_END 2 | ||
| 39 | #endif | ||
| 40 | |||
| 41 | -#define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|" | ||
| 42 | +# define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|\n" | ||
| 43 | |||
| 44 | int | ||
| 45 | mch_expand_wildcards( | ||
| 46 | diff --git a/src/version.c b/src/version.c | ||
| 47 | index 4f3912aedd..712a3e637c 100644 | ||
| 48 | --- a/src/version.c | ||
| 49 | +++ b/src/version.c | ||
| 50 | @@ -724,6 +724,8 @@ static char *(features[]) = | ||
| 51 | |||
| 52 | static int included_patches[] = | ||
| 53 | { /* Add new patch number below this line */ | ||
| 54 | +/**/ | ||
| 55 | + 1684, | ||
| 56 | /**/ | ||
| 57 | 1683, | ||
| 58 | /**/ | ||
| 59 | -- | ||
| 60 | 2.50.1 | ||
| 61 | |||
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 289f31be70..fc9b4db055 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc | |||
| @@ -16,6 +16,7 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ | |||
| 16 | file://disable_acl_header_check.patch \ | 16 | file://disable_acl_header_check.patch \ |
| 17 | file://0001-src-Makefile-improve-reproducibility.patch \ | 17 | file://0001-src-Makefile-improve-reproducibility.patch \ |
| 18 | file://no-path-adjust.patch \ | 18 | file://no-path-adjust.patch \ |
| 19 | file://CVE-2026-33412.patch \ | ||
| 19 | " | 20 | " |
| 20 | 21 | ||
| 21 | PV .= ".1683" | 22 | PV .= ".1683" |
